Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -2,13 +2,10 @@ package com.diagbot.client;
 
 import com.diagbot.client.hystrix.UserServiceHystrix;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
 import com.diagbot.dto.UserOrgDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.util.List;
 import java.util.Map;
@@ -22,9 +19,6 @@ import java.util.Map;
 @FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
 public interface UserServiceClient {
 
-    @PostMapping(value = "/user/{username}")
-    RespDTO<User> getUser(@RequestHeader(value = "Authorization") String token, @PathVariable("username") String username);
-
     @PostMapping(value = "/user/getUserAndOrg")
     RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(@RequestBody List<Long> userIds);
 

diagbotman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -2,7 +2,6 @@ package com.diagbot.client.hystrix;
 
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
 import com.diagbot.dto.UserOrgDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -20,13 +19,6 @@ import java.util.Map;
 @Slf4j
 public class UserServiceHystrix implements UserServiceClient {
 
-    @Override
-    public RespDTO<User> getUser(String token, String username) {
-        System.out.println(token);
-        System.out.println(username);
-        return null;
-    }
-
     @Override
     public RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(List<Long> userIds) {
         log.error("【hystrix】调用{}异常", "getUserAndOrg");

diagbotman-service/src/main/java/com/diagbot/facade/ServiceInfoFacade.java

@@ -128,7 +128,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         serviceInfoVO.setUserId(userId);
         serviceInfoVO.setType(ServiceTypeEnum.User_Create.getKey());
         QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
-        qw.eq("is_deleted", "N").
+        qw.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("type", ServiceTypeEnum.User_Create.getKey()).
                 eq("user_id", userId).
                 orderByDesc("gmt_create");

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -43,7 +44,7 @@ public class DiagLantoneProductController {
     @PostMapping("/addProducts")
     @SysLogger("addProducts")
     @Transactional
-    public RespDTO<Boolean> addProducts(AddProductsVO addProductsVO) {
+    public RespDTO<Boolean> addProducts(@RequestBody AddProductsVO addProductsVO) {
         return RespDTO.onSuc(lantoneProductFacade.addProducts(addProductsVO));
     }
 
@@ -61,7 +62,7 @@ public class DiagLantoneProductController {
     @PostMapping("/updateProduct")
     @SysLogger("updateProduct")
     @Transactional
-    public RespDTO<Boolean> updateProduct(UpdateProductVO updateProductVO) {
+    public RespDTO<Boolean> updateProduct(@RequestBody UpdateProductVO updateProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.updateProduct(updateProductVO));
     }
 
@@ -70,7 +71,7 @@ public class DiagLantoneProductController {
     @PostMapping("/updateServiceStatus")
     @SysLogger("updateServiceStatus")
     @Transactional
-    public RespDTO<Boolean> updateServiceStatus(UpdateProductVO updateProductVO) {
+    public RespDTO<Boolean> updateServiceStatus(@RequestBody UpdateProductVO updateProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.updateProduct(updateProductVO));
     }
 
@@ -79,7 +80,7 @@ public class DiagLantoneProductController {
     @PostMapping("/deleteProduct")
     @SysLogger("deleteProduct")
     @Transactional
-    public RespDTO<Boolean> deleteProduct(UpdateProductVO updateProductVO) {
+    public RespDTO<Boolean> deleteProduct(@RequestBody UpdateProductVO updateProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.deleteProduct(updateProductVO));
     }
 
@@ -90,7 +91,7 @@ public class DiagLantoneProductController {
     )
     @PostMapping("/opendedProduct")
     @SysLogger("opendedProduct")
-    public RespDTO<List<OpendProductWrapper>> opendedProduct(OppendedProductVO oppendedProductVO) {
+    public RespDTO<List<OpendProductWrapper>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
 
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(oppendedProductVO));
     }

diagbotman-service/src/main/java/com/diagbot/web/DiagOrderDetailsController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -36,7 +37,7 @@ public class DiagOrderDetailsController {
                             "status:订单状态（0.未付款1.已付款）")
     @PostMapping("/getAllOrderDetials")
     @SysLogger("getAllOrderDetials")
-    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
+    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
         List<OrderDetailsWapper> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
         return RespDTO.onSuc(list);
     }
@@ -46,7 +47,7 @@ public class DiagOrderDetailsController {
                     "id:订单明细id，根据订单明细id修改审核状态，必填<br>")
     @PostMapping("/auditStatus")
     @SysLogger("auditStatus")
-    public RespDTO<Boolean> auditStatus(AuditStatusVO auditStatusVO) {
+    public RespDTO<Boolean> auditStatus(@RequestBody AuditStatusVO auditStatusVO) {
         return RespDTO.onSuc(orderDetailsFacade.updateAuditStatus(auditStatusVO));
     }
 }

diagbotman-service/src/main/java/com/diagbot/web/MoreServiceController.java

@@ -35,7 +35,7 @@ public class MoreServiceController {
     @ApiOperation(value = "用户更多服务——显示产品[by:wangyu]", notes = "根据用户id查询已开通信息")
     @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
-    public RespDTO<IPage<LantoneProduct>> showProductInfo(Page page) {
+    public RespDTO<IPage<LantoneProduct>> showProductInfo(@RequestBody Page page) {
         return lantoneProductFacade.productLine(page);
     }
 

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -74,7 +74,7 @@ public class ProductOrderController {
     @ApiOperation(value = "控制台-产品立即试用接口[by:rengb]", notes = "控制台-产品立即试用接口")
     @PostMapping("/openUpOnTrial")
     @SysLogger("openUpOnTrial")
-    public RespDTO<OpenUpOnTrialDTO> openUpOnTrial(OpenUpOnTrialVO openUpOnTrialVO) {
+    public RespDTO<OpenUpOnTrialDTO> openUpOnTrial(@RequestBody OpenUpOnTrialVO openUpOnTrialVO) {
         return RespDTO.onSuc(openedProductsFacade.openUpOnTrial(openUpOnTrialVO));
     }
 
@@ -137,7 +137,7 @@ public class ProductOrderController {
                             "status:订单状态（0.未付款1.已付款）")
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
-    public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(ProductOrderVO productOrderVO) {
+    public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
         return productOrderFacade.selectAllProductOrder(productOrderVO);
     }
 

diagbotman-service/src/main/java/com/diagbot/web/ProductServiceController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -46,7 +47,7 @@ public class ProductServiceController {
     @PostMapping("/genProductService")
     @SysLogger("genProductService")
     @Transactional
-    public RespDTO<ProductServiceDTO> genProductService(ProductServiceSaveVO productServiceSaveVO) {
+    public RespDTO<ProductServiceDTO> genProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
         return RespDTO.onSuc(productServiceDTO);
     }
@@ -64,7 +65,7 @@ public class ProductServiceController {
     @PostMapping("/deleteProductService")
     @SysLogger("deleteProductService")
     @Transactional
-    public RespDTO<Boolean> deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
+    public RespDTO<Boolean> deleteProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
         Boolean isSuccess = productServiceFacade.deleteProductService(productServiceSaveVO);
         return RespDTO.onSuc(isSuccess);
     }
@@ -78,7 +79,7 @@ public class ProductServiceController {
     @ApiOperation(value = "获取当前登录用户产品服务分页列表[by:zhaops]", notes = "获取当前登录用户产品服务分页列表")
     @PostMapping("/getProductServiceByCurrentUser")
     @SysLogger("getProductServiceByCurrentUser")
-    public RespDTO getProductServiceByCurrentUser(Page page) {
+    public RespDTO getProductServiceByCurrentUser(@RequestBody Page page) {
         IPage<ProductServiceWrapper> psPage = productServiceFacade.selectProductServiceByCurrentUserPage(page);
         return RespDTO.onSuc(psPage);
     }

diagbotman-service/src/main/java/com/diagbot/web/ServiceInfoController.java

@@ -115,7 +115,7 @@ public class ServiceInfoController {
     @PostMapping("/getServiceListPageByCurrentUser")
     @SysLogger("getServiceListPageByCurrentUser")
     @Transactional
-    public RespDTO getServiceListPageByCurrentUser(Page<ServiceInfo> page) {
+    public RespDTO getServiceListPageByCurrentUser(@RequestBody Page<ServiceInfo> page) {
         IPage<ServiceInfo> list = serviceInfoFacade.getServiceListPageByCurrentUser(page);
         return RespDTO.onSuc(list);
     }

diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -32,7 +32,6 @@
         <result column="decription" property="decription"/>
         <result column="charge_type" property="chargeType"/>
         <result column="url" property="url"/>
-        <result column="open_num" property="openNum"/>
         <result column="service_status" property="serviceStatus"/>
         <result column="trial_status" property="trialStatus"/>
         <result column="trial_url" property="trialUrl"/>

gateway-service/src/main/java/com/diagbot/config/RouteConfigurer.java

@@ -0,0 +1,70 @@
+package com.diagbot.config;
+
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.gateway.discovery.DiscoveryClientRouteDefinitionLocator;
+import org.springframework.cloud.gateway.discovery.DiscoveryLocatorProperties;
+import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.codec.ServerCodecConfigurer;
+import org.springframework.http.codec.support.DefaultServerCodecConfigurer;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.cors.reactive.CorsUtils;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import reactor.core.publisher.Mono;
+
+/**
+ * @Description: 跨域路由配置
+ * @author: gaodm
+ * @time: 2018/9/28 9:39
+ */
+@Configuration
+public class RouteConfigurer {
+
+    private static final String ALL = "*";
+    private static final String MAX_AGE = "18000L";
+
+    @Bean
+    public RouteDefinitionLocator discoveryClientRouteDefinitionLocator(DiscoveryClient discoveryClient,
+                                                                        DiscoveryLocatorProperties properties) {
+        return new DiscoveryClientRouteDefinitionLocator(discoveryClient, properties);
+    }
+
+    @Bean
+    public ServerCodecConfigurer serverCodecConfigurer() {
+        return new DefaultServerCodecConfigurer();
+    }
+
+    @Bean
+    public WebFilter corsFilter() {
+        return (ServerWebExchange ctx, WebFilterChain chain) -> {
+            ServerHttpRequest request = ctx.getRequest();
+            if (!CorsUtils.isCorsRequest(request)) {
+                return chain.filter(ctx);
+            }
+            HttpHeaders requestHeaders = request.getHeaders();
+            ServerHttpResponse response = ctx.getResponse();
+            HttpMethod requestMethod = requestHeaders.getAccessControlRequestMethod();
+            HttpHeaders headers = response.getHeaders();
+            headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, requestHeaders.getOrigin());
+            headers.addAll(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, requestHeaders.getAccessControlRequestHeaders());
+            if (requestMethod != null) {
+                headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, requestMethod.name());
+            }
+            headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true");
+            headers.add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, ALL);
+            headers.add(HttpHeaders.ACCESS_CONTROL_MAX_AGE, MAX_AGE);
+            if (request.getMethod() == HttpMethod.OPTIONS) {
+                response.setStatusCode(HttpStatus.OK);
+                return Mono.empty();
+            }
+            return chain.filter(ctx);
+        };
+    }
+}

user-service/src/main/java/com/diagbot/entity/ImgVerInfo.java

@@ -21,4 +21,6 @@ public class ImgVerInfo {
     private Date createTime;
     //验证码过期时间
     private Date expireTime;
+    //验证码过期时间字符串
+    private String expireTimeStr;
 }

user-service/src/main/java/com/diagbot/entity/SwsVerInfo.java

@@ -21,4 +21,6 @@ public class SwsVerInfo {
     private Date createTime;
     //验证码过期时间
     private Date expireTime;
+    //验证码过期时间字符串
+    private String expireTimeStr;
 }

user-service/src/main/java/com/diagbot/enums/ConstantEnum.java

@@ -0,0 +1,53 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 常量枚举类
+ * @Author: ztg
+ * @Date: 2018/9/28 10:45
+ */
+public enum ConstantEnum implements KeyedNamed {
+
+    //TODO 短信过期时间，上线后设为3，测试阶段设大
+    SMS_EXPIRED_INTERVAL(99999, "短信失效时间(分钟)"),
+
+    IMG_EXPIRED_INTERVAL(3, "图片验证码失效时间(分钟)");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ConstantEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ConstantEnum getEnum(Integer key) {
+        for (ConstantEnum item : ConstantEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ConstantEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -332,8 +332,8 @@ public class UserFacade extends UserServiceImpl {
      * 重置密码
      *
      * @param username     用户名
-     * @param password     密码
-     * @param diffPassword 重置的密码
+     * @param password     重置密码
+     * @param diffPassword 是否与上次密码不同标识
      * @return 重置密码是否成功
      */
     public RespDTO resetPassword(String username, String password, String diffPassword) {
@@ -700,7 +700,7 @@ public class UserFacade extends UserServiceImpl {
      * @param autStatus
      * @return 分页查询用户信息和机构信息开通产品
      */
-    public RespDTO<UserInfoDTO> getUserOrganProductAlls(Page page, String orgName, Integer autStatus){
+    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAlls(Page page, String orgName, Integer autStatus){
     	
     	 UserInfoDTO userInfo = new UserInfoDTO();
          userInfo.setOrgName(orgName);

user-service/src/main/java/com/diagbot/facade/VerFacade.java

@@ -4,6 +4,7 @@ import com.diagbot.dto.ImgVerCreatDTO;
 import com.diagbot.entity.ImgVerInfo;
 import com.diagbot.entity.SwsVerInfo;
 import com.diagbot.entity.User;
+import com.diagbot.enums.ConstantEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -29,7 +30,6 @@ import org.springframework.stereotype.Component;
 @Component
 public class VerFacade {
 
-    public final static int SMS_MINS = 3000; //短信验证码间隔为3分钟 //TODO 时间间隔先调大了，之后改为3
     @Autowired
     private ImgVerService imgVerService;
     @Autowired
@@ -104,7 +104,7 @@ public class VerFacade {
             //验证是否超过三分钟
             SwsVerInfo swsVerInfoCheck = smsVerService.getSmsVerification(smsVerCreatVO.getMobile());
             if (null != swsVerInfoCheck) {
-                if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), VerFacade.SMS_MINS),
+                if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
                         DateUtil.now())) {
                     throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR,
                             "同一用户三分钟之内不能重复发送验证短信，请三分钟之后再次发送!");
@@ -158,7 +158,7 @@ public class VerFacade {
         //验证是否超过三分钟
         SwsVerInfo swsVerInfoCheck = smsVerService.getSmsVerification(smsVerCreatVO.getMobile());
         if (null != swsVerInfoCheck) {
-            if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), 3000), //TODO 方便测试先加大时间间隔
+            if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
                     DateUtil.now())) {
                 throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR,
                         "同一用户三分钟之内不能重复发送验证短信，请三分钟之后再次发送!");

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -37,7 +37,7 @@ public interface UserService extends IService<User> {
      */
     IPage<User> selectUserListPage(Page<User> page, User user);
 
-    public IPage<UserInfoDTO> selectUserInfoListPage(Page<UserInfoDTO> page, UserInfoDTO userInfo);
+    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo);
 
     public boolean updateUserInfoAll(Map<String, Object> userMap);
 

user-service/src/main/java/com/diagbot/service/impl/ImgVerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.diagbot.service.impl;
 
 import com.diagbot.entity.ImgVerInfo;
+import com.diagbot.enums.ConstantEnum;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.service.ImgVerService;
@@ -68,8 +69,9 @@ public class ImgVerServiceImpl implements ImgVerService {
         Object[] obj = VerifyCodeUtils.createImage();
         imgVerInfo.setCode(obj[0].toString());
         imgVerInfo.setCreateTime(DateUtil.now());
-        final Date expireDate = DateUtil.addMinutes(DateUtil.now(), 20);
+        final Date expireDate = DateUtil.addMinutes(DateUtil.now(), ConstantEnum.IMG_EXPIRED_INTERVAL.getKey());
         imgVerInfo.setExpireTime(expireDate);
+        imgVerInfo.setExpireTimeStr(DateUtil.format(expireDate, "yyyy-MM-dd HH:mm:ss"));
         final byte[] redis_key = getUserImgKey(imgVerInfo.getImgId());
         redisForImg.execute(new RedisCallback<Object>() {
             @Override

user-service/src/main/java/com/diagbot/service/impl/SmsVerServiceImpl.java

@@ -4,6 +4,7 @@ import com.aliyuncs.IAcsClient;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.diagbot.entity.SwsVerInfo;
+import com.diagbot.enums.ConstantEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
@@ -113,8 +114,9 @@ public class SmsVerServiceImpl implements SmsVerService {
                     "验证码不能为空!");
         }
         swsVerInfo.setCreateTime(DateUtil.now());
-        final Date expireDate = DateUtil.addMinutes(DateUtil.now(), 3);
+        final Date expireDate = DateUtil.addMinutes(DateUtil.now(),  ConstantEnum.SMS_EXPIRED_INTERVAL.getKey());
         swsVerInfo.setExpireTime(expireDate);
+        swsVerInfo.setExpireTimeStr(DateUtil.format(expireDate, "yyyy-MM-dd HH:mm:ss"));
         final byte[] redis_key = getUserSmsKey(swsVerInfo.getMobile());
         redisForSms.execute(new RedisCallback<Object>() {
             @Override

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -52,7 +52,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public IPage<UserInfoDTO> selectUserInfoListPage(Page<UserInfoDTO> page, UserInfoDTO userInfo) {
+    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo) {
         return baseMapper.selectUserInfoListPage(page, userInfo);
 
     }

user-service/src/main/java/com/diagbot/vo/AppkeySecretVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: appkey和secret接收参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class AppkeySecretVO {
+
+    @NotBlank(message = "请输入appkey!")
+    private String appkey;
+    @NotBlank(message = "请输入secret!")
+    private String secret;
+
+}

user-service/src/main/java/com/diagbot/vo/BaseIdVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/9/28 14:22
+ */
+@Getter
+@Setter
+public class BaseIdVO {
+    private Long id;
+}

user-service/src/main/java/com/diagbot/vo/ResetPasswordVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: 重置密码参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class ResetPasswordVO {
+
+    @NotBlank(message = "请输入手机号!")
+    private String username;
+    @NotBlank(message = "请输入密码!")
+    private String password;
+    private String diffPassword; //密码是否与修改前一样标识
+
+}

user-service/src/main/java/com/diagbot/vo/UserInfoByIdPageVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/9/28 14:20
+ */
+@Getter
+@Setter
+public class UserInfoByIdPageVO extends Page {
+    private Long id;
+}

user-service/src/main/java/com/diagbot/vo/UserInfoPagVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/9/28 13:39
+ */
+@Getter
+@Setter
+public class UserInfoPagVO extends Page {
+    String orgName;
+    Integer autStatus;
+}

user-service/src/main/java/com/diagbot/vo/UserLoginVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: 登录参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class UserLoginVO {
+
+    @NotBlank(message = "请输入手机号!")
+    private String username;
+    @NotBlank(message = "请输入密码!")
+    private String password;
+
+}

user-service/src/main/java/com/diagbot/vo/UserOrganProductPageVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/9/28 13:48
+ */
+@Getter
+@Setter
+public class UserOrganProductPageVO extends Page {
+    String orgName;
+    Integer autStatus;
+}

user-service/src/main/java/com/diagbot/vo/UserSaveVO.java

@@ -1,11 +1,11 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
-import java.util.Date;
 
 /**
  * @Description: 图片验证码验证输入信息
@@ -14,13 +14,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class UserSaveVO {
-    private Long id;
-    private String isDeleted;
-    private Date gmtCreate;
-    private Date gmtModified;
-    private String creator;
-    private String modifier;
+public class UserSaveVO extends Page {
+
     @NotBlank(message = "请输入密码!")
     @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$", message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
     private String password;

user-service/src/main/java/com/diagbot/vo/UsernameVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2018/9/28 14:18
+ */
+@Getter
+@Setter
+public class UsernameVO {
+    String username;//用户名
+}

user-service/src/main/java/com/diagbot/web/ReportFormController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,7 +52,7 @@ public class ReportFormController {
     @PostMapping("/exportUserInfo")
     @SysLogger("exportUserInfo")
     @Transactional
-    public RespDTO export(UserExportVO userExportVO)
+    public RespDTO export(@RequestBody UserExportVO userExportVO)
             throws Exception {
         RespDTO resul = userFacade.export(userExportVO);
         return resul;

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -11,7 +11,13 @@ import com.diagbot.entity.Permission;
 import com.diagbot.entity.User;
 import com.diagbot.facade.PermissionFacade;
 import com.diagbot.facade.UserFacade;
+import com.diagbot.vo.AppkeySecretVO;
+import com.diagbot.vo.BaseIdVO;
+import com.diagbot.vo.ResetPasswordVO;
+import com.diagbot.vo.UserInfoByIdPageVO;
+import com.diagbot.vo.UserLoginVO;
 import com.diagbot.vo.UserSaveVO;
+import com.diagbot.vo.UsernameVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,8 +72,8 @@ public class UserController {
                     "password：密码, 必填<br> ")
     @PostMapping("/login")
     @SysLogger("login")
-    public RespDTO<LoginDTO> login(@RequestParam String username, @RequestParam String password) {
-        return userFacade.login(username, password);
+    public RespDTO<LoginDTO> login(@RequestBody UserLoginVO userLoginVO) {
+        return userFacade.login(userLoginVO.getUsername(), userLoginVO.getPassword());
     }
 
 
@@ -78,8 +84,8 @@ public class UserController {
     @PostMapping("/resetPassword")
     @SysLogger("resetPassword")
     @Transactional
-    public RespDTO<Boolean> resetPassword(String username, String password, String diffPassword) {
-        return userFacade.resetPassword(username, password, diffPassword);
+    public RespDTO<Boolean> resetPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), resetPasswordVO.getDiffPassword());
     }
 
 
@@ -112,16 +118,16 @@ public class UserController {
     @SysLogger("index")
     @ApiOperation(value = "用来测试分页，未用[by:zhoutg]")
     @ApiIgnore
-    public RespDTO<IPage<User>> indexUser(Page page, UserSaveVO userSaveVO) {
-        return userFacade.index(page, userSaveVO);
+    public RespDTO<IPage<User>> indexUser(@RequestBody UserSaveVO userSaveVO) {
+        return userFacade.index(userSaveVO, userSaveVO);
     }
 
-    @ApiOperation(value = "获取资源信息[by:zhoutg]",
+    @ApiOperation(value = "获取资源信息，接口未用[by:zhoutg]",
             notes = "appkey：用户名,必填<br>" +
                     "secret：密码, 必填<br> ")
     @PostMapping("/getPermission")
-    public RespDTO<Permission> getPermission(@RequestParam String appkey, @RequestParam String secret) {
-        return permissionFacade.getPermission(appkey, secret);
+    public RespDTO<Permission> getPermission(@RequestBody AppkeySecretVO appkeySecretVO) {
+        return permissionFacade.getPermission(appkeySecretVO.getAppkey(), appkeySecretVO.getSecret());
     }
 
 
@@ -130,9 +136,9 @@ public class UserController {
     @SysLogger("getByUsername")
     @ApiIgnore
     //    @PreAuthorize("hasAnyAuthority('ROLE_USER')")
-    public RespDTO getUserInfo(@RequestParam String username) {
+    public RespDTO getUserInfo(@RequestBody UsernameVO usernameVO) {
         //参数判读省略
-        User user = userFacade.getUserInfo(username);
+        User user = userFacade.getUserInfo(usernameVO.getUsername());
         return RespDTO.onSuc(user);
     }
 
@@ -140,10 +146,10 @@ public class UserController {
     @PostMapping("/getUserInfoByID")
     @SysLogger("getUserInfoByID")
     @ApiIgnore
-    public RespDTO getUserInfoByID(Long id, Page page) {
+    public RespDTO getUserInfoByID(@RequestBody UserInfoByIdPageVO userInfoByIdPageVO) {
         User userVo = new User();
-        userVo.setId(id);
-        IPage<User> user = userFacade.selectUserListPage(page, userVo);
+        userVo.setId(userInfoByIdPageVO.getId());
+        IPage<User> user = userFacade.selectUserListPage(userInfoByIdPageVO, userVo);
         return RespDTO.onSuc(user);
     }
 
@@ -203,7 +209,7 @@ public class UserController {
     /**
      * 查询用户信息
      *
-     * @param id 用户ID
+     * @param baseIdVO 用户ID
      * @return 用户信息
      */
     @ApiOperation(value = "查询用户(示例)[by:gaodm]", notes = "查询用户")
@@ -211,14 +217,14 @@ public class UserController {
     @SysLogger("getUser")
     @Transactional
     @ApiIgnore
-    public RespDTO getUser(Long id) {
-        return RespDTO.onSuc(userFacade.getById(id));
+    public RespDTO getUser(@RequestBody BaseIdVO baseIdVO) {
+        return RespDTO.onSuc(userFacade.getById(baseIdVO.getId()));
     }
 
     /**
      * 删除用户
      *
-     * @param id 用户ID
+     * @param baseIdVO 用户ID
      * @return 删除是否成功
      */
     @ApiOperation(value = "删除用户(示例)[by:gaodm]", notes = "删除用户")
@@ -226,8 +232,8 @@ public class UserController {
     @SysLogger("delUser")
     @Transactional
     @ApiIgnore
-    public RespDTO delUser(Long id) {
-        return RespDTO.onSuc(userFacade.removeById(id));
+    public RespDTO delUser(@RequestBody BaseIdVO baseIdVO) {
+        return RespDTO.onSuc(userFacade.removeById(baseIdVO.getId()));
     }
 
     @ApiOperation(value = "控制台账户信息[by:rengb]", notes = "控制台账户信息")

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import javax.validation.Valid;
 
+import com.diagbot.vo.UserInfoPagVO;
+import com.diagbot.vo.UserOrganProductPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,11 +56,11 @@ public class UserInfoController {
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
     // @ApiIgnore
-    public RespDTO<UserInfoDTO> getUserInfoPag(Page page, String orgName, Integer autStatus) {
+    public RespDTO<UserInfoDTO> getUserInfoPag(@RequestBody UserInfoPagVO userInfoPagVO) {
         UserInfoDTO userInfo = new UserInfoDTO();
-        userInfo.setOrgName(orgName);
-        userInfo.setAutStatus(autStatus);
-        IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(page, userInfo);
+        userInfo.setOrgName(userInfoPagVO.getOrgName());
+        userInfo.setAutStatus(userInfoPagVO.getAutStatus());
+        IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(userInfoPagVO, userInfo);
         return RespDTO.onSuc(user);
     }
 
@@ -114,12 +116,13 @@ public class UserInfoController {
 
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
+
     @ApiOperation(value = "用户信息和机构信息已开通产品[by:wangfeng]", notes = "用户信息和机构信息已开通产品")
     @PostMapping("/getUserOrganProductAll")
     @SysLogger("getUserOrganProductAll")
     @Transactional
-    public RespDTO<UserInfoDTO> getUserOrganProductAll(Page page, String orgName, Integer autStatus) {
-       
-        return userFacade.getUserOrganProductAlls(page,orgName,autStatus);
+    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAll(@RequestBody UserOrganProductPageVO pageVO) {
+
+        return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAutStatus());
     }
 }