Compare commits
No commits in common. "master" and "dev" have entirely different histories.
|
|
@ -5,7 +5,6 @@ target/
|
||||||
|
|
||||||
### IntelliJ IDEA ###
|
### IntelliJ IDEA ###
|
||||||
.idea/
|
.idea/
|
||||||
logs
|
|
||||||
### Eclipse ###
|
### Eclipse ###
|
||||||
.apt_generated
|
.apt_generated
|
||||||
.classpath
|
.classpath
|
||||||
|
|
|
||||||
|
|
@ -22,17 +22,14 @@
|
||||||
<groupId>com.muyu</groupId>
|
<groupId>com.muyu</groupId>
|
||||||
<artifactId>cloud-common-core</artifactId>
|
<artifactId>cloud-common-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--支付宝依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alipay.sdk</groupId>
|
|
||||||
<artifactId>alipay-easysdk</artifactId>
|
|
||||||
<version>2.2.0</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alipay.sdk</groupId>
|
<groupId>io.swagger.core.v3</groupId>
|
||||||
<artifactId>alipay-sdk-java</artifactId>
|
<artifactId>swagger-annotations-jakarta</artifactId>
|
||||||
<version>4.22.113.ALL</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
package com.muyu;
|
|
||||||
|
|
||||||
|
|
||||||
public class Main {
|
|
||||||
public static void main(String[] args) {
|
|
||||||
System.out.println("Hello world!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
package com.muyu.market.admain;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.muyu.common.core.annotation.Excel;
|
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
|
||||||
|
|
||||||
import com.muyu.market.admain.response.OrdersUpdResp;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@SuperBuilder
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@TableName(value = "订单表",autoResultMap = true)
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
|
||||||
public class Orders extends BaseEntity {
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单的唯一标识
|
|
||||||
*/
|
|
||||||
@TableId(value = "orderId",type = IdType.AUTO)
|
|
||||||
private Long orderId;
|
|
||||||
/**
|
|
||||||
* 用户名
|
|
||||||
*/
|
|
||||||
@Excel(name = "用户名")
|
|
||||||
private Long userId;
|
|
||||||
/**
|
|
||||||
* 商品Id
|
|
||||||
*/
|
|
||||||
@Excel(name = "商品Id")
|
|
||||||
private Long productId;
|
|
||||||
/**
|
|
||||||
* 订单号
|
|
||||||
*/
|
|
||||||
@Excel(name = "订单号")
|
|
||||||
private String orderNo;
|
|
||||||
/**
|
|
||||||
* 订单状态
|
|
||||||
*/
|
|
||||||
@Excel(name = "订单状态")
|
|
||||||
private String orderStatus;
|
|
||||||
/**
|
|
||||||
* 订单总金额
|
|
||||||
*/
|
|
||||||
@Excel(name = "订单总金额")
|
|
||||||
private BigDecimal totalAmount;
|
|
||||||
/**
|
|
||||||
* 订单创建时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单创建时间",defaultValue = "2024-8-15 10:00:57",type = "Date")
|
|
||||||
private Date createTime;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单更新时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date updateTime;
|
|
||||||
/**
|
|
||||||
* 订单备注
|
|
||||||
*/
|
|
||||||
@Excel(name = "订单备注")
|
|
||||||
private String note;
|
|
||||||
|
|
||||||
|
|
||||||
public static Orders UpdOrdersReq(OrdersUpdResp ordersUpdResp, Supplier<Long> orderId){
|
|
||||||
|
|
||||||
return Orders
|
|
||||||
.builder()
|
|
||||||
.orderId(orderId.get())
|
|
||||||
.userId(ordersUpdResp.getUserId())
|
|
||||||
.productId(ordersUpdResp.getProductId())
|
|
||||||
.orderNo(ordersUpdResp.getOrderNo())
|
|
||||||
.orderStatus(ordersUpdResp.getOrderStatus())
|
|
||||||
.totalAmount(ordersUpdResp.getTotalAmount())
|
|
||||||
.createTime(ordersUpdResp.getCreateTime())
|
|
||||||
.updateTime(ordersUpdResp.getUpdateTime())
|
|
||||||
.note(ordersUpdResp.getNote())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -31,7 +31,7 @@ public class Product extends BaseEntity {
|
||||||
/**
|
/**
|
||||||
* 商品ID
|
* 商品ID
|
||||||
*/
|
*/
|
||||||
@TableId(value = "product_id",type = IdType.AUTO)
|
@TableId(value = "productId",type = IdType.AUTO)
|
||||||
private Long productId;
|
private Long productId;
|
||||||
/**
|
/**
|
||||||
* 商品名称
|
* 商品名称
|
||||||
|
|
@ -70,25 +70,6 @@ public class Product extends BaseEntity {
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
/**
|
|
||||||
*接口地址
|
|
||||||
*/
|
|
||||||
@Excel(name = "接口地址")
|
|
||||||
private String apiAddr;
|
|
||||||
/**
|
|
||||||
*请求方式
|
|
||||||
*/
|
|
||||||
@Excel(name = "请求方式")
|
|
||||||
private String apiWay;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private String createBy;
|
|
||||||
private String updateBy;
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static Product SaveProductList(ProductSaveReq productSave){
|
public static Product SaveProductList(ProductSaveReq productSave){
|
||||||
|
|
||||||
|
|
@ -101,8 +82,6 @@ public class Product extends BaseEntity {
|
||||||
.status(productSave.getStatus())
|
.status(productSave.getStatus())
|
||||||
.createTime(productSave.getCreateTime())
|
.createTime(productSave.getCreateTime())
|
||||||
.updateTime(productSave.getUpdateTime())
|
.updateTime(productSave.getUpdateTime())
|
||||||
.apiAddr(productSave.getApiAddr())
|
|
||||||
.apiWay(productSave.getApiWay())
|
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -119,12 +98,9 @@ public class Product extends BaseEntity {
|
||||||
.status(productUpdReq.getStatus())
|
.status(productUpdReq.getStatus())
|
||||||
.createTime(productUpdReq.getCreateTime())
|
.createTime(productUpdReq.getCreateTime())
|
||||||
.updateTime(productUpdReq.getUpdateTime())
|
.updateTime(productUpdReq.getUpdateTime())
|
||||||
.apiAddr(productUpdReq.getApiAddr())
|
|
||||||
.apiWay(productUpdReq.getApiWay())
|
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//https://gitea.qinmian.online/cloud/cloud-ui.git
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
package com.muyu.market.admain;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class SelectByPhone {
|
|
||||||
// 省份
|
|
||||||
private String province;
|
|
||||||
// 城市
|
|
||||||
private String city;
|
|
||||||
// 区号
|
|
||||||
private String areacode;
|
|
||||||
// 邮编
|
|
||||||
private String zip;
|
|
||||||
// 运营商
|
|
||||||
private String company;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
package com.muyu.market.admain;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class SelectWeather {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 城市
|
|
||||||
*/
|
|
||||||
private String city;
|
|
||||||
/**
|
|
||||||
* 天气
|
|
||||||
*/
|
|
||||||
private String info;
|
|
||||||
/**
|
|
||||||
* 温度
|
|
||||||
*/
|
|
||||||
private String temperature;
|
|
||||||
/**
|
|
||||||
* 湿度
|
|
||||||
*/
|
|
||||||
private String humidity;
|
|
||||||
/**
|
|
||||||
* 风向
|
|
||||||
*/
|
|
||||||
private String direct;
|
|
||||||
/**
|
|
||||||
* 风力
|
|
||||||
*/
|
|
||||||
private String power;
|
|
||||||
/**
|
|
||||||
* 空气质量
|
|
||||||
*/
|
|
||||||
private String aqi;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
package com.muyu.market.admain.request;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Tag(name = "订单查询", description = "订单查询")
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
public class OrdersSelectReq {
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单的唯一标识
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",description = "订单ID",defaultValue = "1")
|
|
||||||
private Long orderId;
|
|
||||||
/**
|
|
||||||
*用户ID
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",defaultValue = "用户ID",description = "用户ID")
|
|
||||||
private Long userId;
|
|
||||||
/**
|
|
||||||
* 商品ID
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",defaultValue = "商品ID",description = "1")
|
|
||||||
private Long productId;
|
|
||||||
/**
|
|
||||||
* 订单号
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单号",description = "订单号")
|
|
||||||
private String orderNo;
|
|
||||||
/**
|
|
||||||
* 订单状态
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单状态",description = "订单状态")
|
|
||||||
private String orderStatus;
|
|
||||||
/**
|
|
||||||
* 订单总金额
|
|
||||||
*/
|
|
||||||
@Schema(type = "BigDecimal",defaultValue = "25.3",description = "订单总金额")
|
|
||||||
private String totalAmount;
|
|
||||||
/**
|
|
||||||
* 订单创建时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单创建时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date createTime;
|
|
||||||
/**
|
|
||||||
* 订单更新时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date updateTime;
|
|
||||||
/**
|
|
||||||
* 订单备注
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单备注",description = "订单备注")
|
|
||||||
private String note;
|
|
||||||
}
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
package com.muyu.market.admain.request;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.muyu.common.core.annotation.Excel;
|
|
||||||
import com.muyu.market.admain.Product;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@SuperBuilder
|
|
||||||
@Tag(name = "商品展示", description = "商品展示")
|
|
||||||
public class ProductListReq {
|
|
||||||
/**
|
|
||||||
* 商品ID
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",description = "商品ID",defaultValue = "1")
|
|
||||||
private Long productId;
|
|
||||||
/**
|
|
||||||
* 商品名称
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "商品名称",description = "商品名称")
|
|
||||||
private String productName;
|
|
||||||
/**
|
|
||||||
* 商品价格
|
|
||||||
*/
|
|
||||||
@Schema(description = "商品价格",type = "BigDecimal",defaultValue = "25.3")
|
|
||||||
private BigDecimal productPrice;
|
|
||||||
/**
|
|
||||||
* 库存数量
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "库存数量",description = "库存数量")
|
|
||||||
private String stock;
|
|
||||||
/**
|
|
||||||
* 商品描述
|
|
||||||
*/
|
|
||||||
@Schema(description = "商品描述",defaultValue = "------",type = "String")
|
|
||||||
private String description;
|
|
||||||
/**
|
|
||||||
* 商品状态（1: 在售, 0: 下架）
|
|
||||||
*/
|
|
||||||
@Schema(description = "商品状态:同数据字典",defaultValue = "Y",type = "String")
|
|
||||||
private String status;
|
|
||||||
/**
|
|
||||||
* 创建时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "创建时间",defaultValue = "2024-8-15 10:00:57",type = "Date")
|
|
||||||
private Date createTime;
|
|
||||||
/**
|
|
||||||
* 更新时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date updateTime;
|
|
||||||
/**
|
|
||||||
*接口地址
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "接口地址",description = "接口地址")
|
|
||||||
private String apiAddr;
|
|
||||||
/**
|
|
||||||
*请求方式
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "请求方式",description = "请求方式")
|
|
||||||
private String apiWay;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -41,7 +41,7 @@ public class ProductSaveReq {
|
||||||
/**
|
/**
|
||||||
* 商品状态（1: 在售, 0: 下架）
|
* 商品状态（1: 在售, 0: 下架）
|
||||||
*/
|
*/
|
||||||
@Schema(description = "商品状态",defaultValue = "y",type = "String")
|
@Schema(description = "商品状态:同数据字典",defaultValue = "Y",type = "String")
|
||||||
private String status;
|
private String status;
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
|
|
@ -55,17 +55,6 @@ public class ProductSaveReq {
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
/**
|
|
||||||
*接口地址
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "接口地址",description = "接口地址")
|
|
||||||
private String apiAddr;
|
|
||||||
/**
|
|
||||||
*请求方式
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "请求方式",description = "请求方式")
|
|
||||||
private String apiWay;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private BigDecimal begin;
|
private BigDecimal begin;
|
||||||
|
|
|
||||||
|
|
@ -60,17 +60,6 @@ public class ProductUpdReq {
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
/**
|
|
||||||
*接口地址
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "接口地址",description = "接口地址")
|
|
||||||
private String apiAddr;
|
|
||||||
/**
|
|
||||||
*请求方式
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "请求方式",description = "请求方式")
|
|
||||||
private String apiWay;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
package com.muyu.market.admain.response;
|
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@SuperBuilder
|
|
||||||
@Tag(name = "订单查询", description = "订单查询")
|
|
||||||
public class OrdersSelectResp {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单的唯一标识
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",description = "订单ID",defaultValue = "1")
|
|
||||||
private Long orderId;
|
|
||||||
/**
|
|
||||||
*用户ID
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",defaultValue = "用户ID",description = "用户ID")
|
|
||||||
private Long userId;
|
|
||||||
/**
|
|
||||||
* 商品ID
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",defaultValue = "商品ID",description = "1")
|
|
||||||
private Long productId;
|
|
||||||
/**
|
|
||||||
* 订单号
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单号",description = "订单号")
|
|
||||||
private String orderNo;
|
|
||||||
/**
|
|
||||||
* 订单状态
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单状态",description = "订单状态")
|
|
||||||
private String orderStatus;
|
|
||||||
/**
|
|
||||||
* 订单总金额
|
|
||||||
*/
|
|
||||||
@Schema(type = "BigDecimal",defaultValue = "25.3",description = "订单总金额")
|
|
||||||
private String totalAmount;
|
|
||||||
/**
|
|
||||||
* 订单创建时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单创建时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date createTime;
|
|
||||||
/**
|
|
||||||
* 订单更新时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date updateTime;
|
|
||||||
/**
|
|
||||||
* 订单备注
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单备注",description = "订单备注")
|
|
||||||
private String note;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
package com.muyu.market.admain.response;
|
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.experimental.SuperBuilder;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@SuperBuilder
|
|
||||||
@Tag(name = "订单查询", description = "订单查询")
|
|
||||||
public class OrdersUpdResp {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单的唯一标识
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",description = "订单ID",defaultValue = "1")
|
|
||||||
private Long orderId;
|
|
||||||
/**
|
|
||||||
*用户ID
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",defaultValue = "用户ID",description = "用户ID")
|
|
||||||
private Long userId;
|
|
||||||
/**
|
|
||||||
* 商品ID
|
|
||||||
*/
|
|
||||||
@Schema(type = "Long",defaultValue = "商品ID",description = "1")
|
|
||||||
private Long productId;
|
|
||||||
/**
|
|
||||||
* 订单号
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单号",description = "订单号")
|
|
||||||
private String orderNo;
|
|
||||||
/**
|
|
||||||
* 订单状态
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单状态",description = "订单状态")
|
|
||||||
private String orderStatus;
|
|
||||||
/**
|
|
||||||
* 订单总金额
|
|
||||||
*/
|
|
||||||
@Schema(type = "BigDecimal",defaultValue = "25.3",description = "订单总金额")
|
|
||||||
private BigDecimal totalAmount;
|
|
||||||
/**
|
|
||||||
* 订单创建时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单创建时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date createTime;
|
|
||||||
/**
|
|
||||||
* 订单更新时间
|
|
||||||
*/
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@Schema(description = "订单更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
|
||||||
private Date updateTime;
|
|
||||||
/**
|
|
||||||
* 订单备注
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "订单备注",description = "订单备注")
|
|
||||||
private String note;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -2,7 +2,6 @@ package com.muyu.market.admain.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.muyu.market.admain.Product;
|
import com.muyu.market.admain.Product;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
|
@ -22,7 +21,7 @@ public class ProductListResp {
|
||||||
/**
|
/**
|
||||||
* 商品ID
|
* 商品ID
|
||||||
*/
|
*/
|
||||||
@Schema(type = "Long",description = "商品ID",defaultValue = "1")
|
@Schema(type = "Long",description = "客户ID",defaultValue = "1")
|
||||||
private Long productId;
|
private Long productId;
|
||||||
/**
|
/**
|
||||||
* 商品名称
|
* 商品名称
|
||||||
|
|
@ -61,16 +60,6 @@ public class ProductListResp {
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
/**
|
|
||||||
*接口地址
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "接口地址",description = "接口地址")
|
|
||||||
private String apiAddr;
|
|
||||||
/**
|
|
||||||
*请求方式
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "请求方式",description = "请求方式")
|
|
||||||
private String apiWay;
|
|
||||||
|
|
||||||
|
|
||||||
private BigDecimal begin;
|
private BigDecimal begin;
|
||||||
|
|
@ -89,8 +78,6 @@ public class ProductListResp {
|
||||||
.status(productlist.getStatus())
|
.status(productlist.getStatus())
|
||||||
.createTime(productlist.getCreateTime())
|
.createTime(productlist.getCreateTime())
|
||||||
.updateTime(productlist.getUpdateTime())
|
.updateTime(productlist.getUpdateTime())
|
||||||
.apiAddr(productlist.getApiAddr())
|
|
||||||
.apiWay(productlist.getApiWay())
|
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package com.muyu.market.admain.response;
|
package com.muyu.market.admain.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
|
@ -42,7 +41,7 @@ public class ProductSaveResp {
|
||||||
/**
|
/**
|
||||||
* 商品状态（1: 在售, 0: 下架）
|
* 商品状态（1: 在售, 0: 下架）
|
||||||
*/
|
*/
|
||||||
@Schema(description = "同数据字典",defaultValue = "Y",type = "String")
|
@Schema(description = "商品状态:同数据字典",defaultValue = "Y",type = "String")
|
||||||
private String status;
|
private String status;
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
|
|
@ -56,16 +55,10 @@ public class ProductSaveResp {
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
@Schema(description = "更新时间",defaultValue = "2024-5-15 10:00:52",type = "Date")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
/**
|
|
||||||
*接口地址
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "接口地址",description = "接口地址")
|
|
||||||
private String apiAddr;
|
|
||||||
/**
|
|
||||||
*请求方式
|
|
||||||
*/
|
|
||||||
@Schema(type = "String",defaultValue = "请求方式",description = "请求方式")
|
|
||||||
private String apiWay;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
package com.muyu.pay.domain;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class AliPay {
|
|
||||||
private String traceNo;
|
|
||||||
private String totalAmount;
|
|
||||||
private String subject;
|
|
||||||
private String alipayTraceNo;
|
|
||||||
}
|
|
||||||
|
|
@ -73,61 +73,24 @@
|
||||||
<artifactId>cloud-common-api-doc</artifactId>
|
<artifactId>cloud-common-api-doc</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.muyu</groupId>
|
|
||||||
<artifactId>cloud-market-common</artifactId>
|
|
||||||
<version>1.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- XllJob定时任务 -->
|
<!-- XllJob定时任务 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.muyu</groupId>
|
<groupId>com.muyu</groupId>
|
||||||
<artifactId>cloud-common-xxl</artifactId>
|
<artifactId>cloud-common-xxl</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- <dependency>-->
|
||||||
<dependency>
|
<!-- <groupId>com.muyu</groupId>-->
|
||||||
<groupId>com.muyu</groupId>
|
<!-- <artifactId>cloud-common-rabbit</artifactId>-->
|
||||||
<artifactId>cloud-common-rabbit</artifactId>
|
<!-- </dependency>-->
|
||||||
<version>1.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.muyu</groupId>
|
<groupId>com.muyu</groupId>
|
||||||
<artifactId>cloud-market-common</artifactId>
|
<artifactId>cloud-market-common</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>com.muyu</groupId>-->
|
||||||
<dependency>
|
<!-- <artifactId>cloud-common-nacos-api</artifactId>-->
|
||||||
<groupId>com.muyu</groupId>
|
<!-- </dependency>-->
|
||||||
<artifactId>cloud-common-nacos-api</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- api接口 需要用到的依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-beanutils</groupId>
|
|
||||||
<artifactId>commons-beanutils</artifactId>
|
|
||||||
<version>1.9.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-lang</groupId>
|
|
||||||
<artifactId>commons-lang</artifactId>
|
|
||||||
<version>2.6</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-logging</groupId>
|
|
||||||
<artifactId>commons-logging</artifactId>
|
|
||||||
<version>1.2</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.json-lib</groupId>
|
|
||||||
<artifactId>json-lib</artifactId>
|
|
||||||
<version>2.4</version>
|
|
||||||
<classifier>jdk13</classifier>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,11 @@ import com.muyu.common.security.annotation.EnableCustomConfig;
|
||||||
import com.muyu.common.security.annotation.EnableMyFeignClients;
|
import com.muyu.common.security.annotation.EnableMyFeignClients;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
||||||
|
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@EnableCustomConfig
|
@EnableCustomConfig
|
||||||
@EnableMyFeignClients
|
@EnableMyFeignClients
|
||||||
//@EnableScheduling
|
|
||||||
public class MarketApplication {
|
public class MarketApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
SpringApplication.run(MarketApplication.class);
|
SpringApplication.run(MarketApplication.class);
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
package com.muyu.market.server.config;
|
|
||||||
|
|
||||||
|
|
||||||
import com.alipay.easysdk.factory.Factory;
|
|
||||||
import com.alipay.easysdk.kernel.Config;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Component
|
|
||||||
@ConfigurationProperties(prefix = "alipay")
|
|
||||||
public class MyAliPayConfig {
|
|
||||||
private String appId;
|
|
||||||
private String appPrivateKey;
|
|
||||||
private String alipayPublicKey;
|
|
||||||
private String notifyUrl;
|
|
||||||
|
|
||||||
@PostConstruct
|
|
||||||
public void init() {
|
|
||||||
// 设置参数（全局只需设置一次）
|
|
||||||
Config config = new Config();
|
|
||||||
config.protocol = "https";
|
|
||||||
config.gatewayHost = "https://openapi-sandbox.dl.alipaydev.com/gateway.do";
|
|
||||||
config.signType = "RSA2";
|
|
||||||
config.appId = this.appId;
|
|
||||||
config.merchantPrivateKey = this.appPrivateKey;
|
|
||||||
config.alipayPublicKey = this.alipayPublicKey;
|
|
||||||
config.notifyUrl = this.notifyUrl;
|
|
||||||
Factory.setOptions(config);
|
|
||||||
System.out.println("=======支付宝SDK初始化成功=======");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
package com.muyu.market.server.controller;
|
|
||||||
|
|
||||||
import com.alipay.api.AlipayApiException;
|
|
||||||
import com.alipay.api.AlipayClient;
|
|
||||||
import com.alipay.api.DefaultAlipayClient;
|
|
||||||
import com.alipay.api.request.AlipayTradePagePayRequest;
|
|
||||||
|
|
||||||
import com.muyu.market.server.config.MyAliPayConfig;
|
|
||||||
import com.muyu.pay.domain.AliPay;
|
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/alipay")
|
|
||||||
public class AliPayController {
|
|
||||||
//-支付宝网关地址
|
|
||||||
private static final String GATEWAY_URL = "https://openapi-sandbox.dl.alipaydev.com/gateway.do";
|
|
||||||
private static final String FORMAT_JSON = "JSON";
|
|
||||||
private static final String CHARSET_UTF8 = "UTF-8";
|
|
||||||
private static final String SIGN_TYPE_RSA2 = "RSA2";
|
|
||||||
@Autowired
|
|
||||||
private MyAliPayConfig myAliPayConfig;
|
|
||||||
|
|
||||||
@GetMapping("/pay")
|
|
||||||
public void pay(AliPay aliPay, HttpServletResponse httpResponse) throws Exception{
|
|
||||||
AlipayClient alipayClient = new DefaultAlipayClient(GATEWAY_URL, myAliPayConfig.getAppId(),
|
|
||||||
myAliPayConfig.getAppPrivateKey(), FORMAT_JSON, CHARSET_UTF8, myAliPayConfig.getAlipayPublicKey(), SIGN_TYPE_RSA2);
|
|
||||||
AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
|
|
||||||
request.setNotifyUrl(myAliPayConfig.getNotifyUrl());
|
|
||||||
//-商品的内容可以从系统中传递过来，目前这里是手写的
|
|
||||||
aliPay.setTraceNo(UUID.randomUUID().toString().replaceAll("-",""));
|
|
||||||
aliPay.setTotalAmount("100");
|
|
||||||
aliPay.setSubject("笔记本华硕");
|
|
||||||
//=====
|
|
||||||
request.setBizContent("{\"out_trade_no\":\"" + aliPay.getTraceNo() + "\","
|
|
||||||
+ "\"total_amount\":\"" + aliPay.getTotalAmount() + "\","
|
|
||||||
+ "\"subject\":\"" + aliPay.getSubject() + "\","
|
|
||||||
+ "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");
|
|
||||||
String form = "";
|
|
||||||
try {
|
|
||||||
form = alipayClient.pageExecute(request).getBody(); // 调用SDK生成表单
|
|
||||||
} catch (AlipayApiException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
httpResponse.setContentType("text/html;charset=" + CHARSET_UTF8);
|
|
||||||
httpResponse.getWriter().write(form);// 直接将完整的表单html输出到页面
|
|
||||||
httpResponse.getWriter().flush();
|
|
||||||
httpResponse.getWriter().close();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/notify") // 注意这里必须是POST接口
|
|
||||||
public String payNotify(HttpServletRequest request) throws Exception {
|
|
||||||
if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) {
|
|
||||||
System.out.println("=========支付宝异步回调========");
|
|
||||||
|
|
||||||
Map<String, String> params = new HashMap<>();
|
|
||||||
Map<String, String[]> requestParams = request.getParameterMap();
|
|
||||||
for (String name : requestParams.keySet()) {
|
|
||||||
params.put(name, request.getParameter(name));
|
|
||||||
// System.out.println(name + " = " + request.getParameter(name));
|
|
||||||
}
|
|
||||||
|
|
||||||
String tradeNo = params.get("out_trade_no");
|
|
||||||
String gmtPayment = params.get("gmt_payment");
|
|
||||||
String alipayTradeNo = params.get("trade_no");
|
|
||||||
// （不需要）支付宝验签
|
|
||||||
//if (Factory.Payment.Common().verifyNotify(params)) {
|
|
||||||
// 验签通过
|
|
||||||
System.out.println("交易名称: " + params.get("subject"));
|
|
||||||
System.out.println("交易状态: " + params.get("trade_status"));
|
|
||||||
System.out.println("支付宝交易凭证号: " + params.get("trade_no"));
|
|
||||||
System.out.println("商户订单号: " + params.get("out_trade_no"));
|
|
||||||
System.out.println("交易金额: " + params.get("total_amount"));
|
|
||||||
System.out.println("买家在支付宝唯一id: " + params.get("buyer_id"));
|
|
||||||
System.out.println("买家付款时间: " + params.get("gmt_payment"));
|
|
||||||
System.out.println("买家付款金额: " + params.get("buyer_pay_amount"));
|
|
||||||
|
|
||||||
// 更新订单未已支付
|
|
||||||
// ordersMapper.updateState(tradeNo, "已支付", gmtPayment, alipayTradeNo);
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
return "success";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,138 +0,0 @@
|
||||||
package com.muyu.market.server.controller;
|
|
||||||
|
|
||||||
import com.muyu.common.core.domain.Result;
|
|
||||||
import com.muyu.market.admain.Orders;
|
|
||||||
import com.muyu.market.admain.Product;
|
|
||||||
import com.muyu.market.admain.request.OrdersSelectReq;
|
|
||||||
import com.muyu.market.admain.response.OrdersSelectResp;
|
|
||||||
import com.muyu.market.server.service.OrdersService;
|
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/order")
|
|
||||||
@Tag(name = "订单控制层",description = "订单查询")
|
|
||||||
public class OrdersController {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private OrdersService orderService;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 点击下单 添加订单信息
|
|
||||||
* @param product
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@PostMapping("/orders")
|
|
||||||
@Operation(summary = "订单添加",description = "添加添加订单")
|
|
||||||
public Result<String> creatOrder(@RequestBody Product product){
|
|
||||||
|
|
||||||
orderService.saveOrder(product);
|
|
||||||
return Result.success();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询订单信息
|
|
||||||
* @param ordersSelectReq
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@PostMapping("/orderSelect")
|
|
||||||
@Operation(summary = "查询订信息",description = "查询订信息")
|
|
||||||
public Result<List<OrdersSelectResp>> orderSelect(@RequestBody OrdersSelectReq ordersSelectReq){
|
|
||||||
|
|
||||||
List<OrdersSelectResp> sellist = orderService.orderSelect(ordersSelectReq);
|
|
||||||
return Result.success(sellist);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改订单
|
|
||||||
* @param orders
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@PutMapping("/updateOrders")
|
|
||||||
public Result updateOrders(@RequestBody Orders orders){
|
|
||||||
Integer integer = orderService.updateOrders(orders);
|
|
||||||
return Result.success(integer);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// /**
|
|
||||||
// * 修改订单
|
|
||||||
// * @param orderId
|
|
||||||
// * @param ordersUpdResp
|
|
||||||
// * @return
|
|
||||||
// */
|
|
||||||
// @PutMapping("/{orderId}")
|
|
||||||
// @Operation(summary = "订单的修改",description = "通过ID修改订单")
|
|
||||||
// public Result<String> update(
|
|
||||||
// @Schema(title = "订单ID",type = "Long",description = "修改订单信息",defaultValue = "1")
|
|
||||||
// @PathVariable("orderId") Long orderId,
|
|
||||||
// @RequestBody @Validated OrdersUpdResp ordersUpdResp){
|
|
||||||
//
|
|
||||||
// orderService.updateById(Orders.UpdOrdersReq(ordersUpdResp,()->orderId));
|
|
||||||
// return Result.success(null,"操作成功");
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// /**
|
|
||||||
// * 查询订信息
|
|
||||||
// * @param ordersSelectResp
|
|
||||||
// * @return
|
|
||||||
// */
|
|
||||||
// @RequestMapping(path = "/orderSelect",method = RequestMethod.POST)
|
|
||||||
// @Operation(summary = "查询订单",description = "根据接口查看订单信息")
|
|
||||||
// public Result<List<OrdersSelectResp>> findByorderList(@RequestBody OrdersSelectResp ordersSelectResp){
|
|
||||||
// return Result.success(orderService.findByorderList(ordersSelectResp));
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
// /**
|
|
||||||
// * 查询订信息(测试)
|
|
||||||
// * @param 】
|
|
||||||
// * @return
|
|
||||||
// */
|
|
||||||
// @RequestMapping(path = "/orderSelect",method = RequestMethod.GET)
|
|
||||||
// @Operation(summary = "查询所有",description = "查询所有")
|
|
||||||
// public Result<List<OrdersSelectResp>> findAll(){
|
|
||||||
// return Result.success(orderService.findAll());
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// /**
|
|
||||||
// * 根据ID删除订单
|
|
||||||
// * @param orderId
|
|
||||||
// * @return
|
|
||||||
// */
|
|
||||||
// @DeleteMapping
|
|
||||||
// @Operation(summary = "刪除订单",description = "根据订单Id 删除订单")
|
|
||||||
// public Result<String> removeById(@RequestParam(value = "orderId") Long orderId){
|
|
||||||
// orderService.removeById(orderId);
|
|
||||||
// return Result.success(null,"操作成功");
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
package com.muyu.market.server.controller;
|
|
||||||
|
|
||||||
import com.muyu.common.core.domain.Result;
|
|
||||||
import com.muyu.market.admain.Product;
|
|
||||||
import com.muyu.market.admain.SelectByPhone;
|
|
||||||
import com.muyu.market.server.util.SelectPhoneUtil;
|
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/party")
|
|
||||||
@Tag(name = "查询手机号",description = "订单查询")
|
|
||||||
public class PartyController {
|
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/selparty")
|
|
||||||
@Operation(summary = "查询手机号",description = "查询手机号")
|
|
||||||
public SelectByPhone selparty(@RequestParam("phoneNumber") String phoneNumber){
|
|
||||||
|
|
||||||
return SelectPhoneUtil.queryMobileLocation(phoneNumber);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//测试
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SelectPhoneUtil.queryMobileLocation("15066755856");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -38,12 +38,12 @@ public class ProductController {
|
||||||
*/
|
*/
|
||||||
@RequestMapping(path = "/productList",method = RequestMethod.POST)
|
@RequestMapping(path = "/productList",method = RequestMethod.POST)
|
||||||
@Operation(summary = "查询商品接口",description = "根据接口数据可以查看商品信息")
|
@Operation(summary = "查询商品接口",description = "根据接口数据可以查看商品信息")
|
||||||
public Result<List<ProductListResp>> findByproductList( @RequestBody ProductListResp productListResp){
|
public Result<List<ProductListResp>> findByproductList(@Validated @RequestBody ProductListResp productListResp){
|
||||||
|
|
||||||
return Result.success(productService.findByproductList(productListResp));
|
return Result.success(productService.findByproductList(productListResp));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加接口
|
* 添加接口
|
||||||
* @param productSaveReq
|
* @param productSaveReq
|
||||||
|
|
@ -78,7 +78,8 @@ public class ProductController {
|
||||||
|
|
||||||
@DeleteMapping
|
@DeleteMapping
|
||||||
@Operation(summary = "信息删除",description = "根据ID删除")
|
@Operation(summary = "信息删除",description = "根据ID删除")
|
||||||
public Result<String> removeById(@RequestParam(value = "productId") Long productId){
|
public Result<String> removeById(@PathVariable("productId") Long productId){
|
||||||
|
|
||||||
productService.removeById(productId);
|
productService.removeById(productId);
|
||||||
return Result.success(null,"操作成功");
|
return Result.success(null,"操作成功");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
package com.muyu.market.server.controller;
|
|
||||||
|
|
||||||
import com.muyu.market.admain.SelectWeather;
|
|
||||||
import com.muyu.market.server.util.SelectWeatherUtil;
|
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/weather")
|
|
||||||
@Tag(name = "查询天气",description = "查询天气")
|
|
||||||
public class WeatherController {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/selweather")
|
|
||||||
@Operation(summary = "查询天气",description = "查询天气")
|
|
||||||
public SelectWeather selweather(@RequestParam("cityName") String cityName){
|
|
||||||
|
|
||||||
return SelectWeatherUtil.queryWeather(cityName);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SelectWeatherUtil.queryWeather("烟台");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
package com.muyu.market.server.mapper;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|
||||||
import com.muyu.market.admain.Orders;
|
|
||||||
import com.muyu.market.admain.request.OrdersSelectReq;
|
|
||||||
import com.muyu.market.admain.response.OrdersSelectResp;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mapper
|
|
||||||
public interface OrdersMapper extends BaseMapper<Orders>{
|
|
||||||
|
|
||||||
List<OrdersSelectResp> orderSelect(OrdersSelectReq ordersSelectReq);
|
|
||||||
|
|
||||||
Integer updateOrders(Orders orders);
|
|
||||||
|
|
||||||
|
|
||||||
// List<OrdersSelectResp> findByorderList(OrdersSelectResp ordersSelectResp);
|
|
||||||
|
|
||||||
|
|
||||||
// List<OrdersSelectResp> findAll();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -6,5 +6,4 @@ import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface ProductMapper extends BaseMapper<Product> {
|
public interface ProductMapper extends BaseMapper<Product> {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,147 +0,0 @@
|
||||||
package com.muyu.market.server.service.Impl;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
||||||
import com.muyu.common.security.utils.SecurityUtils;
|
|
||||||
import com.muyu.market.admain.Orders;
|
|
||||||
import com.muyu.market.admain.Product;
|
|
||||||
import com.muyu.market.admain.request.OrdersSelectReq;
|
|
||||||
import com.muyu.market.admain.response.OrdersSelectResp;
|
|
||||||
import com.muyu.market.server.mapper.OrdersMapper;
|
|
||||||
import com.muyu.market.server.service.OrdersService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
|
||||||
@Service
|
|
||||||
public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements OrdersService {
|
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private OrdersMapper orderMapper;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<OrdersSelectResp> orderSelect(OrdersSelectReq ordersSelectReq) {
|
|
||||||
return orderMapper.orderSelect(ordersSelectReq);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void saveOrder(Product product) {
|
|
||||||
|
|
||||||
Orders order = new Orders();
|
|
||||||
//获取用户ID
|
|
||||||
Long userId = SecurityUtils.getUserId();
|
|
||||||
order.setUserId(userId);
|
|
||||||
//获取商品ID
|
|
||||||
order.setProductId(product.getProductId());
|
|
||||||
|
|
||||||
// 生成一个随机的UUID
|
|
||||||
UUID uuid = UUID.randomUUID();
|
|
||||||
// 将UUID转换为字符串
|
|
||||||
String random = uuid.toString();
|
|
||||||
//随机生成订单编号
|
|
||||||
order.setOrderNo(random);
|
|
||||||
|
|
||||||
//订单状态(0:未支付 1:已支付)（订单刚生成状态都为未支付）
|
|
||||||
order.setOrderStatus("0");
|
|
||||||
//订单总金额
|
|
||||||
order.setTotalAmount(product.getProductPrice());
|
|
||||||
//订单创建时间(为当前时间)
|
|
||||||
order.setCreateTime(new Date());
|
|
||||||
//订单更新时间(为当前时间)
|
|
||||||
order.setUpdateTime(new Date());
|
|
||||||
|
|
||||||
try {
|
|
||||||
orderMapper.insert(order);
|
|
||||||
} catch (Exception e) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Integer updateOrders(Orders orders) {
|
|
||||||
return orderMapper.updateOrders(orders);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
// public void saveOrder(Product product) {
|
|
||||||
//
|
|
||||||
// Orders order = new Orders();
|
|
||||||
// //获取用户ID
|
|
||||||
// Long userId = SecurityUtils.getUserId();
|
|
||||||
// order.setUserId(userId);
|
|
||||||
// //获取商品ID
|
|
||||||
// order.setProductId(product.getProductId());
|
|
||||||
//
|
|
||||||
// // 生成一个随机的UUID
|
|
||||||
// UUID uuid = UUID.randomUUID();
|
|
||||||
// // 将UUID转换为字符串
|
|
||||||
// String random = uuid.toString();
|
|
||||||
// //随机生成订单编号
|
|
||||||
// order.setOrderNo(random);
|
|
||||||
//
|
|
||||||
// //订单状态(0:未支付 1:已支付)（订单刚生成状态都为未支付）
|
|
||||||
// order.setOrderStatus("0");
|
|
||||||
// //订单总金额
|
|
||||||
// order.setTotalAmount(product.getProductPrice());
|
|
||||||
// //订单创建时间(为当前时间)
|
|
||||||
// order.setCreateTime(new Date());
|
|
||||||
// //订单更新时间(为当前时间)
|
|
||||||
// order.setUpdateTime(new Date());
|
|
||||||
//
|
|
||||||
// try {
|
|
||||||
// orderMapper.insert(order);
|
|
||||||
// } catch (Exception e) {
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//// @Override
|
|
||||||
//// public List<OrdersSelectResp> findAll() {
|
|
||||||
//// return orderMapper.findAll();
|
|
||||||
//// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public List<OrdersSelectResp> findByorderList(OrdersSelectResp ordersSelectResp) {
|
|
||||||
// return orderMapper.findByorderList(ordersSelectResp);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// /**
|
|
||||||
// * 定时任务：每天执行一次，检查并取消24小时前未支付的订单
|
|
||||||
// */
|
|
||||||
// @Scheduled(cron = "0 0 0 * * ?") // 每天的0点0分0秒执行
|
|
||||||
// public void cancelUnpaidOrders() {
|
|
||||||
//
|
|
||||||
// LocalDateTime now = LocalDateTime.now();
|
|
||||||
// LocalDateTime threshold = now.minus(24, ChronoUnit.HOURS); // 24小时前的时间点
|
|
||||||
//
|
|
||||||
// // Orders实体中有一个createTime字段表示订单的创建时间
|
|
||||||
// QueryWrapper<Orders> queryWrapper = new QueryWrapper<>();
|
|
||||||
// queryWrapper.lt("create_time", threshold.toString()) // 创建时间小于24小时前
|
|
||||||
// .eq("status", "未支付"); // 订单状态为未支付
|
|
||||||
//
|
|
||||||
// // 执行查询并取消订单
|
|
||||||
// List<Orders> unpaidOrders = orderMapper.selectList(queryWrapper);
|
|
||||||
// for (Orders order : unpaidOrders) {
|
|
||||||
// // 取消订单的逻辑，比如更新订单状态为已取消
|
|
||||||
// order.setOrderStatus("已取消");
|
|
||||||
// orderMapper.updateById(order);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +1,18 @@
|
||||||
package com.muyu.market.server.service.Impl;
|
package com.muyu.market.server.service.Impl;
|
||||||
|
|
||||||
import com.alibaba.nacos.common.utils.StringUtils;
|
import com.alibaba.csp.sentinel.util.StringUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.muyu.market.admain.Product;
|
import com.muyu.market.admain.Product;
|
||||||
import com.muyu.market.admain.response.ProductListResp;
|
import com.muyu.market.admain.response.ProductListResp;
|
||||||
import com.muyu.market.server.mapper.ProductMapper;
|
import com.muyu.market.server.mapper.ProductMapper;
|
||||||
import com.muyu.market.server.service.ProductService;
|
import com.muyu.market.server.service.ProductService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
|
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ProductMapper productMapper;
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProductListResp> findByproductList(ProductListResp productListResp) {
|
public List<ProductListResp> findByproductList(ProductListResp productListResp) {
|
||||||
|
|
||||||
|
|
@ -27,39 +20,30 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
|
||||||
/**
|
/**
|
||||||
* 查询接口名称
|
* 查询接口名称
|
||||||
*/
|
*/
|
||||||
if (StringUtils.isNotBlank(productListResp.getProductName())) {
|
lambdaQueryWrapperlist.like(StringUtil.isNotEmpty(productListResp.getProductName())
|
||||||
lambdaQueryWrapperlist.like(Product::getProductName, productListResp.getProductName());
|
,Product::getProductName,productListResp.getProductName()
|
||||||
}
|
);
|
||||||
/**
|
/**
|
||||||
* 根据金额查询
|
* 根据金额查询
|
||||||
* ge(>=)
|
* ge(>=)
|
||||||
*/
|
*/
|
||||||
if (productListResp.getBegin()!=null){
|
|
||||||
lambdaQueryWrapperlist.ge(
|
lambdaQueryWrapperlist.ge(
|
||||||
Product::getProductPrice,productListResp.getBegin()
|
Product::getProductPrice,productListResp.getBegin()
|
||||||
);
|
);
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* 根据金额查询
|
* 根据金额查询
|
||||||
* le(<=)
|
* le(<=)
|
||||||
*/
|
*/
|
||||||
if (productListResp.getEnd()!=null){
|
|
||||||
lambdaQueryWrapperlist.le(
|
lambdaQueryWrapperlist.le(
|
||||||
Product::getProductPrice,productListResp.getEnd()
|
Product::getProductPrice,productListResp.getEnd()
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
List<Product> productlist = this.list(lambdaQueryWrapperlist);
|
List<Product> productlist = this.list(lambdaQueryWrapperlist);
|
||||||
|
|
||||||
// return productlist.stream()
|
|
||||||
// .map(productsel -> ProductListResp.selProductList(productsel))
|
|
||||||
// .toList();
|
|
||||||
return productlist.stream()
|
return productlist.stream()
|
||||||
.map(ProductListResp::selProductList)
|
.map(productsel -> ProductListResp.selProductList(productsel))
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
package com.muyu.market.server.service;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
|
||||||
import com.muyu.market.admain.Orders;
|
|
||||||
import com.muyu.market.admain.Product;
|
|
||||||
import com.muyu.market.admain.request.OrdersSelectReq;
|
|
||||||
import com.muyu.market.admain.response.OrdersSelectResp;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
@Service
|
|
||||||
public interface OrdersService extends IService<Orders>{
|
|
||||||
|
|
||||||
|
|
||||||
List<OrdersSelectResp> orderSelect(OrdersSelectReq ordersSelectReq);
|
|
||||||
|
|
||||||
void saveOrder(Product product);
|
|
||||||
|
|
||||||
Integer updateOrders(Orders orders);
|
|
||||||
|
|
||||||
|
|
||||||
// void saveOrder(Product product);
|
|
||||||
//
|
|
||||||
// List<OrdersSelectResp> findByorderList(OrdersSelectResp ordersSelectResp);
|
|
||||||
//
|
|
||||||
//// List<OrdersSelectResp> findAll();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -7,13 +7,6 @@ import com.muyu.market.admain.response.ProductListResp;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public interface ProductService extends IService<Product> {
|
public interface ProductService extends IService<Product> {
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商品接口
|
|
||||||
* @param productListResp
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
List<ProductListResp> findByproductList(ProductListResp productListResp);
|
List<ProductListResp> findByproductList(ProductListResp productListResp);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,147 +0,0 @@
|
||||||
package com.muyu.market.server.util;
|
|
||||||
|
|
||||||
import com.muyu.market.admain.SelectByPhone;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
import java.io.*;
|
|
||||||
import java.net.HttpURLConnection;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLEncoder;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
public class SelectPhoneUtil {
|
|
||||||
// 手机归属地查询接口地址
|
|
||||||
public static String API_URL = "http://apis.juhe.cn/mobile/get";
|
|
||||||
// 接口请求Key
|
|
||||||
public static String API_KEY = "4cfc25ee624fc08ad83b61a3a0ab1bcb";
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据手机号码/手机号码前7位查询号码归属地
|
|
||||||
* @param mobile
|
|
||||||
*/
|
|
||||||
public static SelectByPhone queryMobileLocation(String mobile)
|
|
||||||
{
|
|
||||||
Map<String, Object> params = new HashMap<>();//组合参数
|
|
||||||
params.put("phone", mobile);
|
|
||||||
params.put("key", API_KEY);
|
|
||||||
String queryParams = urlencode(params);
|
|
||||||
|
|
||||||
String response = doGet(API_URL, queryParams);
|
|
||||||
SelectByPhone selectByPhone = new SelectByPhone();
|
|
||||||
try {
|
|
||||||
JSONObject jsonObject = JSONObject.fromObject(response);
|
|
||||||
int error_code = jsonObject.getInt("error_code");
|
|
||||||
if (error_code == 0) {
|
|
||||||
System.out.println("调用接口成功");
|
|
||||||
|
|
||||||
JSONObject result = jsonObject.getJSONObject("result");
|
|
||||||
|
|
||||||
System.out.printf("省份：%s%n", result.getString("province"));
|
|
||||||
System.out.printf("城市：%s%n", result.getString("city"));
|
|
||||||
System.out.printf("区号：%s%n", result.getString("areacode"));
|
|
||||||
System.out.printf("邮编：%s%n", result.getString("zip"));
|
|
||||||
System.out.printf("运营商：%s%n", result.getString("company"));
|
|
||||||
|
|
||||||
selectByPhone.setCompany(result.getString("company"));
|
|
||||||
selectByPhone.setCity(result.getString("city"));
|
|
||||||
selectByPhone.setZip(result.getString("zip"));
|
|
||||||
selectByPhone.setAreacode(result.getString("areacode"));
|
|
||||||
selectByPhone.setProvince(result.getString("province"));
|
|
||||||
} else {
|
|
||||||
System.out.println("调用接口失败：" + jsonObject.getString("reason"));
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return selectByPhone;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* get方式的http请求
|
|
||||||
*
|
|
||||||
* @param httpUrl 请求地址
|
|
||||||
* @return 返回结果
|
|
||||||
*/
|
|
||||||
public static String doGet(String httpUrl, String queryParams) {
|
|
||||||
HttpURLConnection connection = null;
|
|
||||||
InputStream inputStream = null;
|
|
||||||
BufferedReader bufferedReader = null;
|
|
||||||
String result = null;// 返回结果字符串
|
|
||||||
try {
|
|
||||||
// 创建远程url连接对象
|
|
||||||
URL url = new URL(new StringBuffer(httpUrl).append("?").append(queryParams).toString());
|
|
||||||
// 通过远程url连接对象打开一个连接，强转成httpURLConnection类
|
|
||||||
connection = (HttpURLConnection) url.openConnection();
|
|
||||||
// 设置连接方式：get
|
|
||||||
connection.setRequestMethod("GET");
|
|
||||||
// 设置连接主机服务器的超时时间：15000毫秒
|
|
||||||
connection.setConnectTimeout(5000);
|
|
||||||
// 设置读取远程返回的数据时间：60000毫秒
|
|
||||||
connection.setReadTimeout(6000);
|
|
||||||
// 发送请求
|
|
||||||
connection.connect();
|
|
||||||
// 通过connection连接，获取输入流
|
|
||||||
if (connection.getResponseCode() == 200) {
|
|
||||||
inputStream = connection.getInputStream();
|
|
||||||
// 封装输入流，并指定字符集
|
|
||||||
bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
|
|
||||||
// 存放数据
|
|
||||||
StringBuilder sbf = new StringBuilder();
|
|
||||||
String temp;
|
|
||||||
while ((temp = bufferedReader.readLine()) != null) {
|
|
||||||
sbf.append(temp);
|
|
||||||
sbf.append(System.getProperty("line.separator"));
|
|
||||||
}
|
|
||||||
result = sbf.toString();
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} finally {
|
|
||||||
// 关闭资源
|
|
||||||
if (null != bufferedReader) {
|
|
||||||
try {
|
|
||||||
bufferedReader.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (null != inputStream) {
|
|
||||||
try {
|
|
||||||
inputStream.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (connection != null) {
|
|
||||||
connection.disconnect();// 关闭远程连接
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 将map型转为请求参数型
|
|
||||||
*
|
|
||||||
* @param data
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public static String urlencode(Map<String, ?> data) {
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
for (Map.Entry<String, ?> i : data.entrySet()) {
|
|
||||||
try {
|
|
||||||
sb.append(i.getKey()).append("=").append(URLEncoder.encode(i.getValue() + "", "UTF-8")).append("&");
|
|
||||||
} catch (UnsupportedEncodingException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
String result = sb.toString();
|
|
||||||
result = result.substring(0, result.lastIndexOf("&"));
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,154 +0,0 @@
|
||||||
package com.muyu.market.server.util;
|
|
||||||
import com.muyu.market.admain.SelectWeather;
|
|
||||||
import net.sf.json.JSONObject;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
import java.io.*;
|
|
||||||
import java.net.HttpURLConnection;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLEncoder;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
@RestController
|
|
||||||
public class SelectWeatherUtil {
|
|
||||||
|
|
||||||
|
|
||||||
// 天气情况查询接口地址
|
|
||||||
public static String API_URL = "http://apis.juhe.cn/simpleWeather/query";
|
|
||||||
// 接口请求Key
|
|
||||||
public static String API_KEY = "2e7b031d32a2eac211c099bf4918a4dd";
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据城市名查询天气情况
|
|
||||||
*
|
|
||||||
* @param cityName
|
|
||||||
*/
|
|
||||||
public static SelectWeather queryWeather(String cityName) {
|
|
||||||
Map<String, Object> params = new HashMap<>();//组合参数
|
|
||||||
params.put("city", cityName);
|
|
||||||
params.put("key", API_KEY);
|
|
||||||
String queryParams = urlencode(params);
|
|
||||||
|
|
||||||
String response = doGet(API_URL, queryParams);
|
|
||||||
SelectWeather selectWeather = new SelectWeather();
|
|
||||||
|
|
||||||
try {
|
|
||||||
JSONObject jsonObject = JSONObject.fromObject(response);
|
|
||||||
int error_code = jsonObject.getInt("error_code");
|
|
||||||
if (error_code == 0) {
|
|
||||||
System.out.println("调用接口成功");
|
|
||||||
|
|
||||||
JSONObject result = jsonObject.getJSONObject("result");
|
|
||||||
JSONObject realtime = result.getJSONObject("realtime");
|
|
||||||
|
|
||||||
System.out.printf("城市：%s%n", result.getString("city"));
|
|
||||||
System.out.printf("天气：%s%n", realtime.getString("info"));
|
|
||||||
System.out.printf("温度：%s%n", realtime.getString("temperature"));
|
|
||||||
System.out.printf("湿度：%s%n", realtime.getString("humidity"));
|
|
||||||
System.out.printf("风向：%s%n", realtime.getString("direct"));
|
|
||||||
System.out.printf("风力：%s%n", realtime.getString("power"));
|
|
||||||
System.out.printf("空气质量：%s%n", realtime.getString("aqi"));
|
|
||||||
|
|
||||||
selectWeather.setCity(result.getString("city"));
|
|
||||||
selectWeather.setInfo(realtime.getString("info"));
|
|
||||||
selectWeather.setTemperature(realtime.getString("temperature"));
|
|
||||||
selectWeather.setHumidity(realtime.getString("humidity"));
|
|
||||||
selectWeather.setDirect(realtime.getString("direct"));
|
|
||||||
selectWeather.setPower(realtime.getString("power"));
|
|
||||||
selectWeather.setAqi(realtime.getString("aqi"));
|
|
||||||
|
|
||||||
} else {
|
|
||||||
System.out.println("调用接口失败：" + jsonObject.getString("reason"));
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return selectWeather;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* get方式的http请求
|
|
||||||
*
|
|
||||||
* @param httpUrl 请求地址
|
|
||||||
* @return 返回结果
|
|
||||||
*/
|
|
||||||
public static String doGet(String httpUrl, String queryParams) {
|
|
||||||
HttpURLConnection connection = null;
|
|
||||||
InputStream inputStream = null;
|
|
||||||
BufferedReader bufferedReader = null;
|
|
||||||
String result = null;// 返回结果字符串
|
|
||||||
try {
|
|
||||||
// 创建远程url连接对象
|
|
||||||
URL url = new URL(new StringBuffer(httpUrl).append("?").append(queryParams).toString());
|
|
||||||
// 通过远程url连接对象打开一个连接，强转成httpURLConnection类
|
|
||||||
connection = (HttpURLConnection) url.openConnection();
|
|
||||||
// 设置连接方式：get
|
|
||||||
connection.setRequestMethod("GET");
|
|
||||||
// 设置连接主机服务器的超时时间：15000毫秒
|
|
||||||
connection.setConnectTimeout(5000);
|
|
||||||
// 设置读取远程返回的数据时间：60000毫秒
|
|
||||||
connection.setReadTimeout(6000);
|
|
||||||
// 发送请求
|
|
||||||
connection.connect();
|
|
||||||
// 通过connection连接，获取输入流
|
|
||||||
if (connection.getResponseCode() == 200) {
|
|
||||||
inputStream = connection.getInputStream();
|
|
||||||
// 封装输入流，并指定字符集
|
|
||||||
bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
|
|
||||||
// 存放数据
|
|
||||||
StringBuilder sbf = new StringBuilder();
|
|
||||||
String temp;
|
|
||||||
while ((temp = bufferedReader.readLine()) != null) {
|
|
||||||
sbf.append(temp);
|
|
||||||
sbf.append(System.getProperty("line.separator"));
|
|
||||||
}
|
|
||||||
result = sbf.toString();
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} finally {
|
|
||||||
// 关闭资源
|
|
||||||
if (null != bufferedReader) {
|
|
||||||
try {
|
|
||||||
bufferedReader.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (null != inputStream) {
|
|
||||||
try {
|
|
||||||
inputStream.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (connection != null) {
|
|
||||||
connection.disconnect();// 关闭远程连接
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 将map型转为请求参数型
|
|
||||||
*
|
|
||||||
* @param data
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public static String urlencode(Map<String, ?> data) {
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
for (Map.Entry<String, ?> i : data.entrySet()) {
|
|
||||||
try {
|
|
||||||
sb.append(i.getKey()).append("=").append(URLEncoder.encode(i.getValue() + "", "UTF-8")).append("&");
|
|
||||||
} catch (UnsupportedEncodingException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
String result = sb.toString();
|
|
||||||
result = result.substring(0, result.lastIndexOf("&"));
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -54,8 +54,3 @@ spring:
|
||||||
logging:
|
logging:
|
||||||
level:
|
level:
|
||||||
com.muyu.system.mapper: DEBUG
|
com.muyu.system.mapper: DEBUG
|
||||||
alipay:
|
|
||||||
appId: 9021000140631838
|
|
||||||
appPrivateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCWxZholdxU/C9Vh+4hjD4yWH5MUn3ZK7zkFKB09KY1Kz5k6t0fhcdMRbTaJulyQVL21wneb83f+5hhAzk9+j6RLrvIbE1YZyvt9uoUIpljMkEFyVL2L97/m/Bc+D+PMXMor0DxWMgdkGvmm/1Phjaoxr+HZn6WI1ZFXjKNdIUMNs8H5oLXkBpfTVDS8GLXfDxrUT2gx9g2AH8NJMLlWObHwG3ZPQenRg5szhjLHxuuNgcfJXyoW0agSnRqzn8QeYyq5H0XVElrtF+JbBsnvuUgJn/+h/oVoKeFekEYjfqogzx/1oROereXdEk3OxmzrlW0+EUYBEMViv7EGi0z8/jLAgMBAAECggEAYDm+OsmidK76+silZ83dCD7IZKelYEx04tBzVBGsXnS5/qiS9gJonzpB4ZVCGsSsUZQO3WNX7uLhbtEi4HZtJjXAbXsJpik6tUaIQM+QO+of67SA+VS2K0b4Ei3ySs6Ro96uQRqbpZq98tGNywpqqi8moCD/G410CxPCidta6t64jgMigJr1llhzUDNa6KnEZTTof0D9E4HPYm+zQelRa3xDSYojw3VGUr+Ar0gopsyYLUlUgJJLTA4nzKfL7CP0d2+9qrP7OvcpNexe9/PsXTh2rJPKqttYJjXTEzi4+a6GfpX/XF8E9mCAg1QyIl+wZtKhhJDdlwvFf58cddvgoQKBgQDU8znRH+/d253tFPhlqJcUpaNFPzv7r1R3WWt9e5QsHHy60r6CnDpHeu2Q+0xYfeqEonUstM8qCkNqFx68MghYp79SKSEXrPhELdV25GNvF1XjrNB8BNBgd+NO1FiSJjiwXHmZ9f+Sw967lVABZhCvykkKEORN/UVLEvxo+ppGMQKBgQC1QHfiQpmhmQ0mnok+s9VQtkdWl5SvYn0Urpghe31hjnUa30pGEPIlYhpJWpyN1kL77HHr9+NRDfR1pN1TDHf+P3Ru2Kue5C70vLqIWhVJxs6RKVAWAgnrfnBJsM4TVAR93uWHv8Livdj+wf3D/ZLb8FVeOa76pYeu4okAm8ojuwKBgA5AYOQwAPuWERGmz6DuEX5eP3kI7FjBuSNrppf1R0tUdLyEEh/nmLbj8TY8uzVI6AMMZE8joqGroitddL8fkhNs1o8HFaHh/5OAhcK5MjZjF2pvTFygbdmm7F2ANJVDXZPf/HtjTUFjPmrLaVlOnVtGbHDyBHV7t8F4edAExYJhAoGAUUKT/OarBh4eHUBae7gYXNU76oCO8oqPVWRpZCl/Luu1aNTO8dbLGSOAcX6kTZrP8S4ybP539XDyNoQxjfg7G8vLIZ8WYmge/S5X2qW4gZkWJ1KESzmixOes4/zWhyfV07DI6zF36DwBO0YxxVq8Ksr3GwV1g34O9MMvdQxjdd0CgYBu00EaXBQaxANpO+6oH3KECxvxspKZvk4exI72OFbZ1mZayHNG7BVyfuAMNNp/SRoFXGC4/dVq+tycIOQutvRHrBSRRsv1db8No1j8oEYHvQ5br7OxjS941S/KWeIZefBAyajyCzUjIDZBRTBMGVyJ2p2c/SdUmPs2XTMQnG+mUg==
|
|
||||||
alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvAodOIG6vaqMsl5DXjcRYPRro+C/SeTswVo5gqQdikK3qy118GWkVwL9gvEovq23EMCTmSV+KAFsHz8f0UxLEK9FZcfRuM5E7GfnP7sdY0ctjfmUhQ7fWVOTGLuH0h5DiQ+4voO/2Hi6SElvtLXAUBSqMKw6J0PsJ0uUY9CBZCQnZkFJWAAroUWw5ARUMy62KPZSAW2s8Qg4gacdhSk7SBACNGBFcJZHCS09xQJi5SxCHaTRLhhIckLBvuKEWhBsh+jU75BKYAC4ovoWhMAFnIWKwCmubhXqmYjuJ4egUQTQBbD1hasK99I1YzdXRH8OKwKD4Lufb42B9buZ/2hOywIDAQAB
|
|
||||||
notifyUrl: http://r68vnm.natappfree.cc/notify
|
|
||||||
|
|
|
||||||
|
|
@ -1,71 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
|
||||||
<mapper namespace="com.muyu.market.server.mapper.OrdersMapper">
|
|
||||||
|
|
||||||
|
|
||||||
<resultMap id="OrderDetailDTOMap" type="com.muyu.market.admain.response.OrdersSelectResp">
|
|
||||||
<result property="orderId" column="order_id" />
|
|
||||||
<result property="userId" column="user_id" />
|
|
||||||
<result property="productId" column="product_id" />
|
|
||||||
<result property="orderNo" column="order_no" />
|
|
||||||
<result property="orderStatus" column="order_status" />
|
|
||||||
<result property="totalAmount" column="total_amount" />
|
|
||||||
<result property="createTime" column="create_time" />
|
|
||||||
<result property="updateTime" column="update_time" />
|
|
||||||
<result property="note" column="note" />
|
|
||||||
</resultMap>
|
|
||||||
|
|
||||||
|
|
||||||
<update id="updateOrders">
|
|
||||||
UPDATE `muyu-cloud`.`orders` SET `user_id` = #{userId}, `product_id` = #{productId}, `order_no` = #{orderNo}, `order_status` = #{orderStatus}, `total_amount` = #{totalAmount}, `create_time` = NOW(), `update_time` = NOW(), `note` = #{note} WHERE `order_id` = #{orderId};
|
|
||||||
</update>
|
|
||||||
|
|
||||||
|
|
||||||
<select id="orderSelect" resultType="com.muyu.market.admain.response.OrdersSelectResp">
|
|
||||||
SELECT
|
|
||||||
orders.*,
|
|
||||||
sys_user.user_name,
|
|
||||||
product.product_name,
|
|
||||||
product.product_price,
|
|
||||||
product.description,
|
|
||||||
product.`status`
|
|
||||||
FROM
|
|
||||||
orders
|
|
||||||
LEFT JOIN sys_user ON orders.order_id = sys_user.user_id
|
|
||||||
LEFT JOIN product ON orders.order_id = product.product_id
|
|
||||||
</select>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <select id="findByorderList" resultType="com.muyu.market.admain.response.OrdersSelectResp">-->
|
|
||||||
<!-- SELECT-->
|
|
||||||
<!-- orders.*,-->
|
|
||||||
<!-- sys_user.user_name,-->
|
|
||||||
<!-- product.product_name,-->
|
|
||||||
<!-- product.product_price,-->
|
|
||||||
<!-- product.description,-->
|
|
||||||
<!-- product.`status`-->
|
|
||||||
<!-- FROM-->
|
|
||||||
<!-- orders-->
|
|
||||||
<!-- LEFT JOIN sys_user ON orders.order_id = sys_user.user_id-->
|
|
||||||
<!-- LEFT JOIN product ON orders.order_id = product.product_id-->
|
|
||||||
<!-- </select>-->
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <select id="findAll" resultType="com.muyu.market.admain.response.OrdersSelectResp">-->
|
|
||||||
<!-- SELECT-->
|
|
||||||
<!-- orders.*,-->
|
|
||||||
<!-- sys_user.user_name,-->
|
|
||||||
<!-- product.product_name,-->
|
|
||||||
<!-- product.product_price,-->
|
|
||||||
<!-- product.description,-->
|
|
||||||
<!-- product.`status`-->
|
|
||||||
<!-- FROM-->
|
|
||||||
<!-- orders-->
|
|
||||||
<!-- LEFT JOIN sys_user ON orders.order_id = sys_user.user_id-->
|
|
||||||
<!-- LEFT JOIN product ON orders.order_id = product.product_id-->
|
|
||||||
<!-- </select>-->
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
|
||||||
47192
logs/cloud-pay/error.log
47192
logs/cloud-pay/error.log
File diff suppressed because it is too large
Load Diff
|
|
@ -1,97 +1,151 @@
|
||||||
20:34:56.020 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
08:33:09.757 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:34:59.003 [main] INFO c.d.f.s.ClassPathClientScanner - [processBeanDefinitions,153] - [Forest] Created Forest Client Bean with name 'nacosServiceRemote' and Proxy of 'com.muyu.common.nacos.remote.NacosServiceRemote' client interface
|
08:33:11.889 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:34:59.575 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
08:33:11.890 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:34:59.575 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
08:33:11.969 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:34:59.663 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
08:33:12.215 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:35:02.264 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
08:38:52.400 [main] INFO c.m.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:35:02.265 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success
|
08:38:54.326 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:35:02.265 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master]
|
08:38:54.336 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:35:02.346 [main] INFO c.m.c.d.MyMetaObjectHandler - [<init>,17] - 元对象字段填充控制器 ------- 加载完成
|
08:38:54.408 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:35:03.497 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
|
08:38:54.676 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:35:08.632 [main] INFO c.m.c.r.RabbitConfig - [init,26] - rabbit启动成功
|
08:39:41.781 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:35:09.179 [main] INFO c.m.c.x.XXLJobConfig - [xxlJobExecutor,25] - >>>>>>>>>>> xxl-job config init success.
|
08:39:43.572 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:35:12.206 [main] INFO c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-one-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@14221dc6[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoOneParam]
|
08:39:43.572 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:35:12.207 [main] INFO c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-no-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@2fbd6df8[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoNoParam]
|
08:39:43.642 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:35:12.538 [Thread-12] INFO c.x.j.c.s.EmbedServer - [run,82] - >>>>>>>>>>> xxl-job remoting server start success, nettype = class com.xxl.job.core.server.EmbedServer, port = 9999
|
08:39:43.878 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:35:13.561 [main] INFO c.a.n.client.naming - [initNamespaceForNaming,62] - initializer namespace from ans.namespace attribute : null
|
21:46:57.925 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:35:13.564 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$0,66] - initializer namespace from ALIBABA_ALIWARE_NAMESPACE attribute :null
|
21:46:59.942 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:35:13.565 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$1,73] - initializer namespace from namespace attribute :null
|
21:46:59.942 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:35:13.571 [main] INFO c.a.n.client.naming - [<init>,74] - FailoverDataSource type is class com.alibaba.nacos.client.naming.backups.datasource.DiskFailoverDataSource
|
21:47:00.019 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:35:13.575 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
|
21:47:00.821 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [a8a1271e-10b5-435b-8422-10a792cf4343_config-0] Fail to connect server, after trying 1 times, last try server is {serverIp = '12.2.0.252', server main port = 8848}, error = unknown
|
||||||
20:35:13.575 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
|
21:47:01.022 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:12.2.0.252 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false}
|
||||||
20:35:13.702 [main] INFO c.a.n.c.r.client - [lambda$createClient$0,118] - [RpcClientFactory] create a new rpc client of 422e2963-931e-47c6-a779-0f8b39aa02bd
|
21:47:04.040 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [a8a1271e-10b5-435b-8422-10a792cf4343_config-0] Fail to connect server, after trying 2 times, last try server is {serverIp = '12.2.0.252', server main port = 8848}, error = unknown
|
||||||
20:35:13.705 [main] INFO c.a.n.client.naming - [<init>,109] - Create naming rpc client for uuid->422e2963-931e-47c6-a779-0f8b39aa02bd
|
21:47:04.349 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:12.2.0.252 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false}
|
||||||
20:35:13.705 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] RpcClient init, ServerListFactory = com.alibaba.nacos.client.naming.core.ServerListManager
|
21:47:04.481 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.a.AbstractAbilityControlManager - [initAbilityTable,61] - Ready to get current node abilities...
|
||||||
20:35:13.705 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] Registry connection listener to current client:com.alibaba.nacos.client.naming.remote.gprc.redo.NamingGrpcRedoService
|
21:47:04.483 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.a.AbstractAbilityControlManager - [initAbilityTable,89] - Ready to initialize current node abilities, support modes: [SDK_CLIENT]
|
||||||
20:35:13.705 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] Register server push request handler:com.alibaba.nacos.client.naming.remote.gprc.NamingPushRequestHandler
|
21:47:04.483 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.a.AbstractAbilityControlManager - [initAbilityTable,94] - Initialize current abilities finish...
|
||||||
20:35:13.706 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] Try to connect to server on start up, server: {serverIp = '12.2.0.252', server main port = 8848}
|
21:47:04.484 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.a.d.NacosAbilityManagerHolder - [initAbilityControlManager,85] - [AbilityControlManager] Successfully initialize AbilityControlManager
|
||||||
20:35:13.706 [main] INFO c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:12.2.0.252 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false}
|
21:47:04.520 [com.alibaba.nacos.client.remote.worker.1] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [a8a1271e-10b5-435b-8422-10a792cf4343_config-0] Success to connect a server [12.2.0.252:8848], connectionId = 1724420823640_12.2.0.3_63995
|
||||||
20:35:13.797 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] Success to connect to server [12.2.0.252:8848] on start up, connectionId = 1724848513070_12.2.0.3_63198
|
21:47:04.521 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [a8a1271e-10b5-435b-8422-10a792cf4343_config-0] Notify connected event to listeners.
|
||||||
20:35:13.797 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] Notify connected event to listeners.
|
21:47:04.521 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.c.c.i.ClientWorker - [onConnected,713] - [a8a1271e-10b5-435b-8422-10a792cf4343_config-0] Connected,notify listen context...
|
||||||
20:35:13.797 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler
|
21:47:21.472 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
20:35:13.797 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.client.naming - [onConnected,90] - Grpc connection connect
|
21:47:28.603 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:35:13.797 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [422e2963-931e-47c6-a779-0f8b39aa02bd] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$621/0x00000185a350f060
|
21:47:30.500 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:35:13.799 [main] INFO c.a.n.client.naming - [registerService,133] - [REGISTER-SERVICE] muyu-cloud registering service cloud-market with instance Instance{instanceId='null', ip='192.168.126.1', port=9701, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={IPv6=null, preserved.register.source=SPRING_CLOUD}}
|
21:47:30.500 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:35:14.049 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP cloud-market 192.168.126.1:9701 register finished
|
21:47:30.581 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:35:15.248 [main] INFO c.m.m.s.MarketApplication - [logStarted,56] - Started MarketApplication in 24.607 seconds (process running for 26.924)
|
21:47:31.300 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
20:35:15.263 [main] INFO c.a.n.c.c.i.CacheData - [initNotifyWarnTimeout,72] - config listener notify warn timeout millis use default 60000 millis
|
21:47:31.303 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:35:15.263 [main] INFO c.a.n.c.c.i.CacheData - [<clinit>,99] - nacos.cache.data.init.snapshot = true
|
21:48:28.200 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:35:15.264 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-muyu-cloud-12.2.0.252_8848] [subscribe] cloud-market+DEFAULT_GROUP+muyu-cloud
|
21:48:29.897 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:35:15.276 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-muyu-cloud-12.2.0.252_8848] [add-listener] ok, tenant=muyu-cloud, dataId=cloud-market, group=DEFAULT_GROUP, cnt=1
|
21:48:29.898 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:35:15.276 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-market, group=DEFAULT_GROUP
|
21:48:29.978 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:35:15.278 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-muyu-cloud-12.2.0.252_8848] [subscribe] cloud-market-dev.yml+DEFAULT_GROUP+muyu-cloud
|
21:48:30.639 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
20:35:15.279 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-muyu-cloud-12.2.0.252_8848] [add-listener] ok, tenant=muyu-cloud, dataId=cloud-market-dev.yml, group=DEFAULT_GROUP, cnt=1
|
21:48:30.643 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:35:15.279 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-market-dev.yml, group=DEFAULT_GROUP
|
21:51:21.137 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:35:15.279 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-muyu-cloud-12.2.0.252_8848] [subscribe] cloud-market.yml+DEFAULT_GROUP+muyu-cloud
|
21:51:22.875 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:35:15.279 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-muyu-cloud-12.2.0.252_8848] [add-listener] ok, tenant=muyu-cloud, dataId=cloud-market.yml, group=DEFAULT_GROUP, cnt=1
|
21:51:22.875 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:35:15.279 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-market.yml, group=DEFAULT_GROUP
|
21:51:22.961 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:36:49.693 [nacos-grpc-client-executor-12.2.0.252-45] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [797737dc-d1f8-48d9-b227-f67764915ab3_config-0] Receive server push request, request = ConfigChangeNotifyRequest, requestId = 778
|
21:51:23.531 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
20:36:49.693 [nacos-grpc-client-executor-12.2.0.252-45] INFO c.a.n.c.c.i.ClientWorker - [handleConfigChangeNotifyRequest,666] - [797737dc-d1f8-48d9-b227-f67764915ab3_config-0] [server-push] config changed. dataId=cloud-market-dev.yml, group=DEFAULT_GROUP,tenant=muyu-cloud
|
21:51:23.533 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:36:49.693 [nacos-grpc-client-executor-12.2.0.252-45] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [797737dc-d1f8-48d9-b227-f67764915ab3_config-0] Ack server push request, request = ConfigChangeNotifyRequest, requestId = 778
|
22:06:24.571 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:36:49.784 [nacos.client.config.listener.task-0] INFO c.a.n.c.c.i.ClientWorker - [refreshContentAndCheck,939] - [fixed-muyu-cloud-12.2.0.252_8848] [data-received] dataId=cloud-market-dev.yml, group=DEFAULT_GROUP, tenant=muyu-cloud, md5=60c0fcc952ed1d8c4d8d2e83b17cf0ed, content=# spring配置
|
22:06:26.224 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
spring:
|
22:06:26.224 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
data:
|
22:06:26.287 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
redis:
|
22:06:28.772 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
host: ${redis.host}
|
22:06:28.772 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success
|
||||||
port: ${redis.port}
|
22:06:28.773 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master]
|
||||||
pass..., type=yaml
|
22:06:29.380 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
|
||||||
20:36:49.784 [nacos.client.config.listener.task-0] INFO c.a.n.c.c.i.CacheData - [safeNotifyListener,480] - [fixed-muyu-cloud-12.2.0.252_8848] [notify-listener] task execute in nacos thread, dataId=cloud-market-dev.yml, group=DEFAULT_GROUP,tenant=muyu-cloud, md5=60c0fcc952ed1d8c4d8d2e83b17cf0ed, listener=com.alibaba.cloud.nacos.refresh.NacosContextRefresher$1@36ede1d4
|
22:06:32.800 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing ....
|
||||||
20:36:49.785 [nacos.client.config.listener.task-0] INFO c.a.n.c.c.i.CacheData - [run,420] - [fixed-muyu-cloud-12.2.0.252_8848] [notify-context] dataId=cloud-market-dev.yml, group=DEFAULT_GROUP,tenant=muyu-cloud, md5=60c0fcc952ed1d8c4d8d2e83b17cf0ed
|
22:06:32.801 [main] INFO c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ...
|
||||||
20:36:51.528 [nacos.client.config.listener.task-0] INFO c.a.n.c.c.i.CacheData - [run,451] - [fixed-muyu-cloud-12.2.0.252_8848] [notify-ok] dataId=cloud-market-dev.yml, group=DEFAULT_GROUP,tenant=muyu-cloud, md5=60c0fcc952ed1d8c4d8d2e83b17cf0ed, listener=com.alibaba.cloud.nacos.refresh.NacosContextRefresher$1@36ede1d4 ,job run cost=1743 millis.
|
22:06:32.806 [main] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
|
||||||
20:40:46.086 [http-nio-9701-exec-1] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet'
|
22:06:32.807 [main] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
|
||||||
20:48:49.367 [Thread-12] INFO c.x.j.c.s.EmbedServer - [run,91] - >>>>>>>>>>> xxl-job remoting server stop.
|
22:06:32.807 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye
|
||||||
20:48:49.661 [xxl-job, executor ExecutorRegistryThread] INFO c.x.j.c.t.ExecutorRegistryThread - [run,87] - >>>>>>>>>>> xxl-job registry-remove success, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='cloud-market', registryValue='http://192.168.1.133:9999/'}, registryResult:ReturnT [code=200, msg=null, content=null]
|
22:06:32.808 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:48:49.661 [xxl-job, executor ExecutorRegistryThread] INFO c.x.j.c.t.ExecutorRegistryThread - [run,105] - >>>>>>>>>>> xxl-job, executor registry thread destroy.
|
22:08:06.489 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:48:49.661 [SpringApplicationShutdownHook] INFO c.x.j.c.s.EmbedServer - [stop,117] - >>>>>>>>>>> xxl-job remoting server destroy success.
|
22:08:08.148 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:48:49.662 [xxl-job, executor JobLogFileCleanThread] INFO c.x.j.c.t.JobLogFileCleanThread - [run,99] - >>>>>>>>>>> xxl-job, executor JobLogFileCleanThread thread destroy.
|
22:08:08.149 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:48:49.662 [xxl-job, executor TriggerCallbackThread] INFO c.x.j.c.t.TriggerCallbackThread - [run,98] - >>>>>>>>>>> xxl-job, executor callback thread destroy.
|
22:08:08.221 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:48:49.663 [Thread-11] INFO c.x.j.c.t.TriggerCallbackThread - [run,128] - >>>>>>>>>>> xxl-job, executor retry callback thread destroy.
|
22:08:10.403 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
20:48:49.673 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,95] - De-registering from Nacos Server now...
|
22:08:10.405 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success
|
||||||
20:48:49.673 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [deregisterService,272] - [DEREGISTER-SERVICE] muyu-cloud deregistering service cloud-market with instance: Instance{instanceId='null', ip='192.168.126.1', port=9701, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={}}
|
22:08:10.405 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master]
|
||||||
20:48:49.697 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,115] - De-registration finished.
|
22:08:10.967 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
|
||||||
20:48:49.698 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,254] - com.alibaba.nacos.client.naming.cache.ServiceInfoHolder do shutdown begin
|
22:08:14.410 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing ....
|
||||||
20:48:49.698 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,180] - com.alibaba.nacos.client.naming.backups.FailoverReactor do shutdown begin
|
22:08:14.412 [main] INFO c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ...
|
||||||
20:48:49.699 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,182] - com.alibaba.nacos.client.naming.backups.FailoverReactor do shutdown stop
|
22:08:14.416 [main] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
|
||||||
20:48:49.699 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,256] - com.alibaba.nacos.client.naming.cache.ServiceInfoHolder do shutdown stop
|
22:08:14.417 [main] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
|
||||||
20:48:49.699 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,204] - com.alibaba.nacos.client.naming.remote.NamingClientProxyDelegate do shutdown begin
|
22:08:14.417 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye
|
||||||
20:48:49.699 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,147] - com.alibaba.nacos.client.naming.core.ServiceInfoUpdateService do shutdown begin
|
22:08:14.418 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:48:49.699 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,149] - com.alibaba.nacos.client.naming.core.ServiceInfoUpdateService do shutdown stop
|
22:10:07.398 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:48:49.699 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,218] - com.alibaba.nacos.client.naming.core.ServerListManager do shutdown begin
|
22:10:09.182 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:48:49.700 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,223] - com.alibaba.nacos.client.naming.core.ServerListManager do shutdown stop
|
22:10:09.182 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:48:49.700 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,468] - com.alibaba.nacos.client.naming.remote.http.NamingHttpClientProxy do shutdown begin
|
22:10:09.249 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:48:49.700 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,470] - com.alibaba.nacos.client.naming.remote.http.NamingHttpClientProxy do shutdown stop
|
22:10:11.308 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
20:48:49.700 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,487] - Shutdown naming grpc client proxy for uuid->422e2963-931e-47c6-a779-0f8b39aa02bd
|
22:10:11.309 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success
|
||||||
20:48:49.700 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,331] - Shutdown grpc redo service executor java.util.concurrent.ScheduledThreadPoolExecutor@1b759335[Running, pool size = 1, active threads = 0, queued tasks = 1, completed tasks = 271]
|
22:10:11.309 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master]
|
||||||
20:48:49.700 [SpringApplicationShutdownHook] INFO c.a.n.c.r.client - [shutdown,425] - Shutdown rpc client, set status to shutdown
|
22:10:11.881 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
|
||||||
20:48:49.701 [SpringApplicationShutdownHook] INFO c.a.n.c.r.client - [shutdown,427] - Shutdown client event executor java.util.concurrent.ScheduledThreadPoolExecutor@7f2710fd[Running, pool size = 2, active threads = 2, queued tasks = 0, completed tasks = 0]
|
22:10:15.296 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing ....
|
||||||
20:48:49.701 [SpringApplicationShutdownHook] INFO c.a.n.c.r.client - [closeConnection,584] - Close current connection 1724848513070_12.2.0.3_63198
|
22:10:15.297 [main] INFO c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ...
|
||||||
20:48:49.705 [SpringApplicationShutdownHook] INFO c.a.n.c.r.c.g.GrpcClient - [shutdown,187] - Shutdown grpc executor java.util.concurrent.ThreadPoolExecutor@1e9f537[Running, pool size = 3, active threads = 0, queued tasks = 0, completed tasks = 166]
|
22:10:15.302 [main] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
|
||||||
20:48:49.707 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutDownAndRemove,497] - shutdown and remove naming rpc client for uuid ->422e2963-931e-47c6-a779-0f8b39aa02bd
|
22:10:15.302 [main] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
|
||||||
20:48:49.707 [SpringApplicationShutdownHook] INFO c.a.n.c.a.r.i.CredentialWatcher - [stop,107] - [null] CredentialWatcher is stopped
|
22:10:15.302 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye
|
||||||
20:48:49.707 [SpringApplicationShutdownHook] INFO c.a.n.c.a.r.i.CredentialService - [free,91] - [null] CredentialService is freed
|
22:10:15.303 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
20:48:49.708 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,211] - com.alibaba.nacos.client.naming.remote.NamingClientProxyDelegate do shutdown stop
|
22:11:59.687 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
20:48:49.709 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing ....
|
22:12:02.027 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
20:48:49.710 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ...
|
22:12:02.027 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
20:48:49.715 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
|
22:12:02.108 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
20:48:49.716 [SpringApplicationShutdownHook] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
|
22:12:07.494 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
20:48:49.716 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye
|
22:12:07.496 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success
|
||||||
|
22:12:07.496 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master]
|
||||||
|
22:12:08.096 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
|
||||||
|
22:12:11.475 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing ....
|
||||||
|
22:12:11.477 [main] INFO c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ...
|
||||||
|
22:12:11.482 [main] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
|
||||||
|
22:12:11.482 [main] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
|
||||||
|
22:12:11.482 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye
|
||||||
|
22:12:11.483 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||||
|
22:13:30.137 [main] INFO c.m.m.s.MarketApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
|
||||||
|
22:13:32.241 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||||
|
22:13:32.241 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
|
||||||
|
22:13:32.315 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||||
|
22:13:35.060 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
|
||||||
|
22:13:35.061 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success
|
||||||
|
22:13:35.061 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master]
|
||||||
|
22:13:35.658 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
|
||||||
|
22:13:39.477 [main] INFO c.m.c.x.XXLJobConfig - [xxlJobExecutor,25] - >>>>>>>>>>> xxl-job config init success.
|
||||||
|
22:13:41.471 [main] INFO c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-one-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@2ed4e0e9[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoOneParam]
|
||||||
|
22:13:41.471 [main] INFO c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-no-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@57441348[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoNoParam]
|
||||||
|
22:13:41.471 [main] INFO c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-slice-demo, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@706dd38b[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobSliceDemo]
|
||||||
|
22:13:41.683 [Thread-12] INFO c.x.j.c.s.EmbedServer - [run,82] - >>>>>>>>>>> xxl-job remoting server start success, nettype = class com.xxl.job.core.server.EmbedServer, port = 9999
|
||||||
|
22:13:42.713 [main] INFO c.a.n.client.naming - [initNamespaceForNaming,62] - initializer namespace from ans.namespace attribute : null
|
||||||
|
22:13:42.713 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$0,66] - initializer namespace from ALIBABA_ALIWARE_NAMESPACE attribute :null
|
||||||
|
22:13:42.713 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$1,73] - initializer namespace from namespace attribute :null
|
||||||
|
22:13:42.717 [main] INFO c.a.n.client.naming - [<init>,74] - FailoverDataSource type is class com.alibaba.nacos.client.naming.backups.datasource.DiskFailoverDataSource
|
||||||
|
22:13:42.720 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
|
||||||
|
22:13:42.721 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
|
||||||
|
22:13:42.826 [main] INFO c.a.n.c.r.client - [lambda$createClient$0,118] - [RpcClientFactory] create a new rpc client of 21283258-910d-4cea-8e9f-5fa7cb5644a7
|
||||||
|
22:13:42.828 [main] INFO c.a.n.client.naming - [<init>,109] - Create naming rpc client for uuid->21283258-910d-4cea-8e9f-5fa7cb5644a7
|
||||||
|
22:13:42.828 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] RpcClient init, ServerListFactory = com.alibaba.nacos.client.naming.core.ServerListManager
|
||||||
|
22:13:42.828 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] Registry connection listener to current client:com.alibaba.nacos.client.naming.remote.gprc.redo.NamingGrpcRedoService
|
||||||
|
22:13:42.828 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] Register server push request handler:com.alibaba.nacos.client.naming.remote.gprc.NamingPushRequestHandler
|
||||||
|
22:13:42.829 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] Try to connect to server on start up, server: {serverIp = '12.2.0.252', server main port = 8848}
|
||||||
|
22:13:42.829 [main] INFO c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:12.2.0.252 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false}
|
||||||
|
22:13:42.889 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] Success to connect to server [12.2.0.252:8848] on start up, connectionId = 1724422422026_12.2.0.3_63897
|
||||||
|
22:13:42.890 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler
|
||||||
|
22:13:42.890 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] Notify connected event to listeners.
|
||||||
|
22:13:42.890 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [21283258-910d-4cea-8e9f-5fa7cb5644a7] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$633/0x000002084b536a20
|
||||||
|
22:13:42.890 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.client.naming - [onConnected,90] - Grpc connection connect
|
||||||
|
22:13:42.891 [main] INFO c.a.n.client.naming - [registerService,133] - [REGISTER-SERVICE] muyu-cloud registering service cloud-market with instance Instance{instanceId='null', ip='192.168.126.1', port=9701, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={IPv6=null, preserved.register.source=SPRING_CLOUD}}
|
||||||
|
22:13:42.912 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP cloud-market 192.168.126.1:9701 register finished
|
||||||
|
22:13:44.063 [main] INFO c.m.m.s.MarketApplication - [logStarted,56] - Started MarketApplication in 18.651 seconds (process running for 19.353)
|
||||||
|
22:13:44.071 [main] INFO c.a.n.c.c.i.CacheData - [initNotifyWarnTimeout,72] - config listener notify warn timeout millis use default 60000 millis
|
||||||
|
22:13:44.072 [main] INFO c.a.n.c.c.i.CacheData - [<clinit>,99] - nacos.cache.data.init.snapshot = true
|
||||||
|
22:13:44.072 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-muyu-cloud-12.2.0.252_8848] [subscribe] cloud-market+DEFAULT_GROUP+muyu-cloud
|
||||||
|
22:13:44.077 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-muyu-cloud-12.2.0.252_8848] [add-listener] ok, tenant=muyu-cloud, dataId=cloud-market, group=DEFAULT_GROUP, cnt=1
|
||||||
|
22:13:44.078 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-market, group=DEFAULT_GROUP
|
||||||
|
22:13:44.080 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-muyu-cloud-12.2.0.252_8848] [subscribe] cloud-market-dev.yml+DEFAULT_GROUP+muyu-cloud
|
||||||
|
22:13:44.080 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-muyu-cloud-12.2.0.252_8848] [add-listener] ok, tenant=muyu-cloud, dataId=cloud-market-dev.yml, group=DEFAULT_GROUP, cnt=1
|
||||||
|
22:13:44.080 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-market-dev.yml, group=DEFAULT_GROUP
|
||||||
|
22:13:44.080 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-muyu-cloud-12.2.0.252_8848] [subscribe] cloud-market.yml+DEFAULT_GROUP+muyu-cloud
|
||||||
|
22:13:44.081 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-muyu-cloud-12.2.0.252_8848] [add-listener] ok, tenant=muyu-cloud, dataId=cloud-market.yml, group=DEFAULT_GROUP, cnt=1
|
||||||
|
22:13:44.081 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-market.yml, group=DEFAULT_GROUP
|
||||||
|
22:13:44.215 [RMI TCP Connection(5)-192.168.1.120] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet'
|
||||||
|
|
|
||||||
3
pom.xml
3
pom.xml
|
|
@ -19,7 +19,6 @@
|
||||||
<module>cloud-market-server</module>
|
<module>cloud-market-server</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
|
|
@ -27,6 +26,4 @@
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue