更新

olive-console/src/main/java/com/zrqx/olive/front/controller/ArticleController.java

@@ -30,9 +30,13 @@ import org.springframework.web.bind.annotation.*;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("ArticleFrontController")
-@RequestMapping("api/front/article")
+/*
+ * @Slf4j
+ * 
+ * @RestController("ArticleFrontController")
+ * 
+ * @RequestMapping("api/front/article")
+ */
 @Api(tags = "文章")
 
 public class ArticleController {

olive-console/src/main/java/com/zrqx/olive/front/controller/BargainController.java

@@ -31,10 +31,15 @@ import java.util.Map;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/front/bargain")
-@Api(tags = "砍价商品")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/front/bargain")
+ * 
+ * @Api(tags = "砍价商品")
+ */
 public class BargainController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/front/controller/CartController.java

@@ -36,10 +36,15 @@ import java.util.Map;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/front/cart")
-@Api(tags = "商品 -- 购物车") //配合swagger使用
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/front/cart")
+ * 
+ * @Api(tags = "商品 -- 购物车")
+ */ //配合swagger使用
 public class CartController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/front/controller/CityController.java

@@ -23,10 +23,15 @@ import org.springframework.web.bind.annotation.RestController;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("CityFrontController")
-@RequestMapping("api/front/city")
-@Api(tags = "城市服务")
+/*
+ * @Slf4j
+ * 
+ * @RestController("CityFrontController")
+ * 
+ * @RequestMapping("api/front/city")
+ * 
+ * @Api(tags = "城市服务")
+ */
 public class CityController {
     @Autowired
     private SystemCityService systemCityService;

olive-console/src/main/java/com/zrqx/olive/front/controller/CombinationController.java

@@ -27,10 +27,15 @@ import org.springframework.web.bind.annotation.*;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/front/combination")
-@Api(tags = "拼团商品")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/front/combination")
+ * 
+ * @Api(tags = "拼团商品")
+ */
 public class CombinationController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/front/controller/CouponController.java

@@ -34,10 +34,15 @@ import java.util.List;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("CouponFrontController")
-@RequestMapping("api/front")
-@Api(tags = "优惠券")
+/*
+ * @Slf4j
+ * 
+ * @RestController("CouponFrontController")
+ * 
+ * @RequestMapping("api/front")
+ * 
+ * @Api(tags = "优惠券")
+ */
 
 public class CouponController {
 

olive-console/src/main/java/com/zrqx/olive/front/controller/ExpressController.java

@@ -25,10 +25,15 @@ import org.springframework.web.bind.annotation.RestController;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("ExpressFrontController")
-@RequestMapping("api/front")
-@Api(tags = "物流公司")
+/*
+ * @Slf4j
+ * 
+ * @RestController("ExpressFrontController")
+ * 
+ * @RequestMapping("api/front")
+ * 
+ * @Api(tags = "物流公司")
+ */
 public class ExpressController {
     @Autowired
     private ExpressService expressService;

olive-console/src/main/java/com/zrqx/olive/front/controller/PayController.java

@@ -27,10 +27,15 @@ import javax.servlet.http.HttpServletRequest;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/front/pay")
-@Api(tags = "支付管理")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/front/pay")
+ * 
+ * @Api(tags = "支付管理")
+ */
 public class PayController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/front/controller/ProductController.java

@@ -34,10 +34,15 @@ import java.util.List;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("ProductController")
-@RequestMapping("api/front")
-@Api(tags = "商品")
+/*
+ * @Slf4j
+ * 
+ * @RestController("ProductController")
+ * 
+ * @RequestMapping("api/front")
+ * 
+ * @Api(tags = "商品")
+ */
 public class ProductController {
     @Autowired
     private ProductService productService;

olive-console/src/main/java/com/zrqx/olive/front/controller/SecKillController.java

@@ -26,10 +26,15 @@ import java.util.HashMap;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/front/seckill")
-@Api(tags = "秒杀商品")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/front/seckill")
+ * 
+ * @Api(tags = "秒杀商品")
+ */
 public class SecKillController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/front/controller/StoreController.java

@@ -27,10 +27,15 @@ import org.springframework.web.bind.annotation.RestController;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("StoreController")
-@RequestMapping("api/front/store")
-@Api(tags = "提货点")
+/*
+ * @Slf4j
+ * 
+ * @RestController("StoreController")
+ * 
+ * @RequestMapping("api/front/store")
+ * 
+ * @Api(tags = "提货点")
+ */
 public class StoreController {
     @Autowired
     private SystemStoreService systemStoreService;

olive-console/src/main/java/com/zrqx/olive/front/controller/StoreOrderController.java

@@ -33,10 +33,15 @@ import java.util.Map;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("StoreOrderFrontController")
-@RequestMapping("api/front/order")
-@Api(tags = "订单")
+/*
+ * @Slf4j
+ * 
+ * @RestController("StoreOrderFrontController")
+ * 
+ * @RequestMapping("api/front/order")
+ * 
+ * @Api(tags = "订单")
+ */
 public class StoreOrderController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/front/controller/UserCouponController.java

@@ -30,10 +30,15 @@ import java.util.List;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/front/coupon")
-@Api(tags = "营销 -- 优惠券")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/front/coupon")
+ * 
+ * @Api(tags = "营销 -- 优惠券")
+ */
 public class UserCouponController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/front/controller/UserRechargeController.java

@@ -36,10 +36,15 @@ import java.util.Map;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("UserRechargeController")
-@RequestMapping("api/front/recharge")
-@Api(tags = "用户 -- 充值")
+/*
+ * @Slf4j
+ * 
+ * @RestController("UserRechargeController")
+ * 
+ * @RequestMapping("api/front/recharge")
+ * 
+ * @Api(tags = "用户 -- 充值")
+ */
 public class UserRechargeController {
     @Autowired
     private UserCenterService userCenterService;

olive-console/src/main/java/com/zrqx/olive/front/controller/WeChatController.java

@@ -36,9 +36,13 @@ import java.util.Map;
  *  +----------------------------------------------------------------------
  */
 @Slf4j
-@RestController("WeChatFrontController")
-@RequestMapping("api/front/wechat")
-@Api(tags = "微信 -- 开放平台")
+/*
+ * @RestController("WeChatFrontController")
+ * 
+ * @RequestMapping("api/front/wechat")
+ * 
+ * @Api(tags = "微信 -- 开放平台")
+ */
 public class WeChatController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/project/request/QueryUpholdMemberRequest.java

@@ -19,4 +19,5 @@ public class QueryUpholdMemberRequest {
 	private String projectId;
 	@ApiModelProperty("部门id") 
 	private String departmentId;
+	
 }

olive-console/src/main/java/com/zrqx/olive/system/request/SystemAdminRequest.java

@@ -52,11 +52,11 @@ public class SystemAdminRequest implements Serializable {
     @ApiModelProperty(value = "后台管理员最后一次登录ip")
     private String lastIp;
 
-    @ApiModelProperty(value = "后台管理员最后一次登录时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "后台管理员添加时间")
-    private Date createTime;
+	/*
+	 * @ApiModelProperty(value = "后台管理员最后一次登录时间") private Date updateTime;
+	 * 
+	 * @ApiModelProperty(value = "后台管理员添加时间") private Date createTime;
+	 */
 
     @ApiModelProperty(value = "登录次数")
     private Integer loginCount;

olive-console/src/main/java/com/zrqx/olive/system/response/SystemAdminResponse.java

@@ -36,7 +36,7 @@ public class SystemAdminResponse implements Serializable {
 
     private String lastIp;
 
-    private Date lastTime;
+    private String lastTime;
 
     private Integer addTime;
 

olive-console/src/main/java/com/zrqx/olive/system/service/impl/SystemAdminServiceImpl.java

@@ -14,6 +14,7 @@ import com.constants.SysGroupDataConstants;
 import com.exception.CrmebException;
 import com.github.pagehelper.PageHelper;
 import com.utils.CrmebUtil;
+import com.utils.DateUtils;
 import com.utils.ValidateFormUtil;
 import com.zrqx.olive.authorization.manager.TokenManager;
 import com.zrqx.olive.authorization.model.TokenModel;
@@ -143,7 +144,8 @@ public class SystemAdminServiceImpl extends ServiceImpl<SystemAdminDao, SystemAd
         for (SystemAdmin admin : systemAdmins) {
             SystemAdminResponse sar = new SystemAdminResponse();
             BeanUtils.copyProperties(admin, sar);
-            sar.setLastTime(admin.getUpdateTime());
+            sar.setLastTime(DateUtils.dateTimeToStr(admin.getUpdateTime()));
+            //sar.setLastTime(admin.getUpdateTime());
             if(StringUtils.isBlank(admin.getRoles())) continue;
             List<Integer> roleIds = CrmebUtil.stringToArrayInt(admin.getRoles());
             List<String> roleNames = new ArrayList<>();

olive-console/src/main/java/com/zrqx/olive/wechat/controller/ProgramController.java

@@ -28,10 +28,15 @@ import java.util.List;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/program")
-@Api(tags = "微信开放平台 -- 小程序")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/program")
+ * 
+ * @Api(tags = "微信开放平台 -- 小程序")
+ */
 public class ProgramController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/wechat/controller/TemplateMessageController.java

@@ -28,11 +28,15 @@ import org.springframework.web.bind.annotation.*;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/template")
-@Api(tags = "微信 -- 消息模版") //配合swagger使用
-public class TemplateMessageController {
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/template")
+ * 
+ * @Api(tags = "微信 -- 消息模版") //配合swagger使用
+ */public class TemplateMessageController {
 
     @Autowired
     private TemplateMessageService templateMessageService;

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WeChatAdminController.java

@@ -24,10 +24,15 @@ import org.springframework.web.bind.annotation.RestController;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController("WeChatAdminController")
-@RequestMapping("api/admin/wechat")
-@Api(tags = "微信 -- 开放平台 admin")
+/*
+ * @Slf4j
+ * 
+ * @RestController("WeChatAdminController")
+ * 
+ * @RequestMapping("api/admin/wechat")
+ * 
+ * @Api(tags = "微信 -- 开放平台 admin")
+ */
 public class WeChatAdminController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WeChatController.java

@@ -25,10 +25,15 @@ import org.springframework.web.bind.annotation.*;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/menu")
-@Api(tags = "微信开放平台 -- 菜单管理")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/menu")
+ * 
+ * @Api(tags = "微信开放平台 -- 菜单管理")
+ */
 public class WeChatController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WeChatUserTagsController.java

@@ -29,10 +29,15 @@ import org.springframework.web.bind.annotation.RestController;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/user/tags")
-@Api(tags = "微信开放平台 -- 微信用户标签")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/user/tags")
+ * 
+ * @Api(tags = "微信开放平台 -- 微信用户标签")
+ */
 public class WeChatUserTagsController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WechatMediaController.java

@@ -19,11 +19,15 @@ import java.util.Map;
 /**
  * 微信回复表 前端控制器
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/media")
-@Api(tags = "微信开放平台 -- 素材")
-public class WechatMediaController {
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/media")
+ * 
+ * @Api(tags = "微信开放平台 -- 素材")
+ */public class WechatMediaController {
 
     @Autowired
     private WechatMediaService wechatMediaService;

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WechatProgramMyTempController.java

@@ -29,9 +29,13 @@ import java.util.List;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/program/my/temp")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/program/my/temp")
+ */
 @Api(tags = "微信开放平台 -- 小程序 -- 我的模板") //配合swagger使用
 
 public class WechatProgramMyTempController {

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WechatProgramPublicTempController.java

@@ -29,11 +29,15 @@ import org.springframework.web.bind.annotation.RestController;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/program/public/temp")
-@Api(tags = "微信开放平台 -- 小程序 -- 微信公共模板库") //配合swagger使用
-
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/program/public/temp")
+ * 
+ * @Api(tags = "微信开放平台 -- 小程序 -- 微信公共模板库") //配合swagger使用
+ */
 public class WechatProgramPublicTempController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WechatQrcodeController.java

@@ -31,10 +31,15 @@ import org.springframework.web.bind.annotation.RestController;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/qrcode")
-@Api(tags = "微信开放平台 -- 微信二维码管理")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/qrcode")
+ * 
+ * @Api(tags = "微信开放平台 -- 微信二维码管理")
+ */
 public class WechatQrcodeController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WechatReplyController.java

@@ -28,10 +28,15 @@ import org.springframework.web.bind.annotation.*;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/keywords/reply")
-@Api(tags = "微信开放平台 -- 微信关键字回复")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/keywords/reply")
+ * 
+ * @Api(tags = "微信开放平台 -- 微信关键字回复")
+ */
 public class WechatReplyController {
 
     @Autowired

olive-console/src/main/java/com/zrqx/olive/wechat/controller/WechatUserController.java

@@ -24,10 +24,15 @@ import org.springframework.web.bind.annotation.RestController;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/user")
-@Api(tags = "微信开放平台 -- 微信用户")
+/*
+ * @Slf4j
+ * 
+ * @RestController
+ * 
+ * @RequestMapping("api/admin/wechat/user")
+ * 
+ * @Api(tags = "微信开放平台 -- 微信用户")
+ */
 public class WechatUserController {
 
     @Autowired