Commit c07bae07 authored by licc's avatar licc

部署

parent 34ad5d18
package cn.wisenergy.common.config.file;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
/**
* 文件上传配置
* @author wyy
* @date 2019-08-22 19:20
*/
@Configuration
public class FileUploadConfig {
/**
* 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】
* @return
*/
// @Bean(name = "multipartResolver")
// public MultipartResolver multipartResolver() {
// CommonsMultipartResolver resolver = new CommonsMultipartResolver();
// resolver.setDefaultEncoding("UTF-8");
// resolver.setResolveLazily(true);
// resolver.setMaxInMemorySize(40960);
// resolver.setMaxUploadSize(512 * 1024 * 1024);
// return resolver;
// }
}
package cn.wisenergy.mapper; package cn.wisenergy.mapper;
import cn.wisenergy.model.app.AccountInfo; import cn.wisenergy.model.app.AccountInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
package cn.wisenergy.model.app; package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -20,7 +17,6 @@ import java.util.Date; ...@@ -20,7 +17,6 @@ import java.util.Date;
*/ */
@Data @Data
@ApiModel(value = "User") @ApiModel(value = "User")
@TableName("user_info")
public class User extends Model<User> implements Serializable{ public class User extends Model<User> implements Serializable{
private static final long serialVersionUID = 2525339404301884673L; private static final long serialVersionUID = 2525339404301884673L;
...@@ -28,21 +24,18 @@ public class User extends Model<User> implements Serializable{ ...@@ -28,21 +24,18 @@ public class User extends Model<User> implements Serializable{
* 主键id * 主键id
*/ */
@ApiModelProperty(name = "id", value = "用户主键id") @ApiModelProperty(name = "id", value = "用户主键id")
@TableId("id")
private Integer id; private Integer id;
/** /**
* 手机号作为用户账号 * 手机号作为用户账号
*/ */
@ApiModelProperty(name = "user_id", value = "用户主键id") @ApiModelProperty(name = "user_id", value = "用户主键id")
@TableField("user_id")
private String userId; private String userId;
/** /**
* 密码 * 密码
*/ */
@ApiModelProperty(name = "password", value = "用户密码") @ApiModelProperty(name = "password", value = "用户密码")
@TableField("password")
private String password; private String password;
...@@ -50,49 +43,42 @@ public class User extends Model<User> implements Serializable{ ...@@ -50,49 +43,42 @@ public class User extends Model<User> implements Serializable{
* 用户会员等级 * 用户会员等级
*/ */
@ApiModelProperty(name = "user_level", value = "用户会员等级") @ApiModelProperty(name = "user_level", value = "用户会员等级")
@TableField("user_level")
private int userLevel; private int userLevel;
/** /**
* 跨境额度 * 跨境额度
*/ */
@ApiModelProperty(name = "cross_border_line", value = "跨境额度") @ApiModelProperty(name = "cross_border_line", value = "跨境额度")
@TableField("cross_border_line")
private BigDecimal crossBorderLine; private BigDecimal crossBorderLine;
/** /**
* 身份证号码 * 身份证号码
*/ */
@ApiModelProperty(name = "id_card_number", value = "身份证号码") @ApiModelProperty(name = "id_card_number", value = "身份证号码")
@TableField("id_card_number")
private String idCardNumber; private String idCardNumber;
/** /**
* 粉丝昵称 * 粉丝昵称
*/ */
@ApiModelProperty(name = "fans_nickname", value = "粉丝昵称") @ApiModelProperty(name = "fans_nickname", value = "粉丝昵称")
@TableField("fans_nickname")
private String fansNickname; private String fansNickname;
/** /**
* 有赞粉丝id,有赞自动生成 * 有赞粉丝id,有赞自动生成
*/ */
@ApiModelProperty(name = "fans_id", value = "有赞粉丝id,有赞自动生成") @ApiModelProperty(name = "fans_id", value = "有赞粉丝id,有赞自动生成")
@TableField("fans_id")
private String fansId; private String fansId;
/** /**
* 用户本人邀请码 * 用户本人邀请码
*/ */
@ApiModelProperty(name = "invite_code", value = "用户本人邀请码") @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
@TableField("invite_code")
private String inviteCode; private String inviteCode;
/** /**
* 推荐人邀请码 * 推荐人邀请码
*/ */
@ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码") @ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
@TableField("be_invited_code")
private String beInvitedCode; private String beInvitedCode;
/** /**
...@@ -105,100 +91,4 @@ public class User extends Model<User> implements Serializable{ ...@@ -105,100 +91,4 @@ public class User extends Model<User> implements Serializable{
*/ */
@ApiModelProperty(name = "updateTime", value = "修改时间") @ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime; private Date updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public int getUserLevel() {
return userLevel;
}
public void setUserLevel(int userLevel) {
this.userLevel = userLevel;
}
public BigDecimal getCrossBorderLine() {
return crossBorderLine;
}
public void setCrossBorderLine(BigDecimal crossBorderLine) {
this.crossBorderLine = crossBorderLine;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getFansNickname() {
return fansNickname;
}
public void setFansNickname(String fansNickname) {
this.fansNickname = fansNickname;
}
public String getFansId() {
return fansId;
}
public void setFansId(String fansId) {
this.fansId = fansId;
}
public String getInviteCode() {
return inviteCode;
}
public void setInviteCode(String inviteCode) {
this.inviteCode = inviteCode;
}
public String getBeInvitedCode() {
return beInvitedCode;
}
public void setBeInvitedCode(String beInvitedCode) {
this.beInvitedCode = beInvitedCode;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
} }
...@@ -51,7 +51,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport { ...@@ -51,7 +51,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
@Override @Override
public void addCorsMappings(CorsRegistry registry) { public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**") registry.addMapping("/**")
.allowedOrigins("*") .allowedOriginPatterns("*")
.allowedHeaders("*") .allowedHeaders("*")
.allowedMethods("*") .allowedMethods("*")
.allowCredentials(true) .allowCredentials(true)
......
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.110.164:3306/shop_app?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://39.97.107.31:3306/qunzhihe?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root username: qunzhihe
password: adm4HYservice$ password: j2kRn8HjrPez7trw
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
...@@ -46,9 +46,9 @@ spring: ...@@ -46,9 +46,9 @@ spring:
# 192.168.110.165 adm4HYservice$ # 192.168.110.165 adm4HYservice$
redis: redis:
database: 0 database: 0
host: 127.0.0.1 host: 39.97.107.31
port: 6379 port: 6379
password: 123456 # 密码(默认为空) password: 1qaz@WSX # 密码(默认为空)
timeout: 6000ms # 连接超时时长(毫秒) timeout: 6000ms # 连接超时时长(毫秒)
jedis: jedis:
pool: pool:
......
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/dydb?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://39.97.107.31:3306/qunzhihe?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root username: qunzhihe
password: root password: j2kRn8HjrPez7trw
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
...@@ -35,9 +35,9 @@ spring: ...@@ -35,9 +35,9 @@ spring:
redis: redis:
open: false # 是否开启redis缓存 true开启 false关闭 open: false # 是否开启redis缓存 true开启 false关闭
database: 0 database: 0
host: localhost host: 39.97.107.31
port: 6379 port: 6379
password: # 密码(默认为空) password: 1qaz@WSX # 密码(默认为空)
timeout: 6000ms # 连接超时时长(毫秒) timeout: 6000ms # 连接超时时长(毫秒)
jedis: jedis:
pool: pool:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment