diff --git a/wisenergy-common/src/main/java/cn/wisenergy/common/config/file/FileUploadConfig.java b/wisenergy-common/src/main/java/cn/wisenergy/common/config/file/FileUploadConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..52be10758993fed97db67e524c9149409ebd6888
--- /dev/null
+++ b/wisenergy-common/src/main/java/cn/wisenergy/common/config/file/FileUploadConfig.java
@@ -0,0 +1,29 @@
+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;
+//    }
+}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
index fc2ab6149a40a5626dcf2b69db77a5b8f65c78eb..5ffc1b0569bd1272630fadc7e13935f79e6e3bf9 100644
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
+++ b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
@@ -1,5 +1,6 @@
 package cn.wisenergy.mapper;
 
+
 import cn.wisenergy.model.app.AccountInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
index 3e82553a80032bb621eac484516208b9c0ec6d32..ff62b771938e6f2866a314b406ee705fc9de2aa3 100644
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
+++ b/wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
@@ -1,8 +1,5 @@
 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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +17,6 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "User")
-@TableName("user_info")
 public class User extends Model<User> implements Serializable{
     private static final long serialVersionUID = 2525339404301884673L;
 
@@ -28,21 +24,18 @@ public class User extends Model<User> implements Serializable{
      * 主键id
      */
     @ApiModelProperty(name = "id", value = "用户主键id")
-    @TableId("id")
     private Integer id;
 
     /**
      * 手机号作为用户账号
      */
     @ApiModelProperty(name = "user_id", value = "用户主键id")
-    @TableField("user_id")
     private String userId;
 
     /**
      * 密码
      */
     @ApiModelProperty(name = "password", value = "用户密码")
-    @TableField("password")
     private String password;
 
 
@@ -50,49 +43,42 @@ public class User extends Model<User> implements Serializable{
      * 用户会员等级
      */
     @ApiModelProperty(name = "user_level", value = "用户会员等级")
-    @TableField("user_level")
     private int userLevel;
 
     /**
      * 跨境额度
      */
     @ApiModelProperty(name = "cross_border_line", value = "跨境额度")
-    @TableField("cross_border_line")
     private BigDecimal crossBorderLine;
 
     /**
      * 身份证号码
      */
     @ApiModelProperty(name = "id_card_number", value = "身份证号码")
-    @TableField("id_card_number")
     private String idCardNumber;
 
     /**
      * 粉丝昵称
      */
     @ApiModelProperty(name = "fans_nickname", value = "粉丝昵称")
-    @TableField("fans_nickname")
     private String fansNickname;
 
     /**
      * 有赞粉丝id，有赞自动生成
      */
     @ApiModelProperty(name = "fans_id", value = "有赞粉丝id，有赞自动生成")
-    @TableField("fans_id")
     private String fansId;
 
     /**
      * 用户本人邀请码
      */
     @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
-    @TableField("invite_code")
     private String inviteCode;
 
     /**
      * 推荐人邀请码
      */
     @ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
-    @TableField("be_invited_code")
     private String beInvitedCode;
 
     /**
@@ -105,100 +91,4 @@ public class User extends Model<User> implements Serializable{
      */
     @ApiModelProperty(name = "updateTime", value = "修改时间")
     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;
-    }
 }
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/MvcConfiguration.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/MvcConfiguration.java
index a9f280cd76902218780a189bb3bb6537e5dc5c00..9e64ee88eb6901c03b24833b44653c7c2dbdc3d8 100644
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/MvcConfiguration.java
+++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/MvcConfiguration.java
@@ -51,7 +51,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOriginPatterns("*")
                 .allowedHeaders("*")
                 .allowedMethods("*")
                 .allowCredentials(true)
diff --git a/wisenergy-web-admin/src/main/resources/application-dev.yml b/wisenergy-web-admin/src/main/resources/application-dev.yml
index 128650d4bb67e82547b6e4473d492eedf8415000..6ddb68dba08c329eb2e26097ef6afa8a65a02482 100644
--- a/wisenergy-web-admin/src/main/resources/application-dev.yml
+++ b/wisenergy-web-admin/src/main/resources/application-dev.yml
@@ -3,9 +3,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       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
-      username: root
-      password: adm4HYservice$
+      url: jdbc:mysql://39.97.107.31:3306/qunzhihe?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+      username: qunzhihe
+      password: j2kRn8HjrPez7trw
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -46,9 +46,9 @@ spring:
 #  192.168.110.165  adm4HYservice$
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 39.97.107.31
     port: 6379
-    password: 123456    # 密码（默认为空）
+    password: 1qaz@WSX    # 密码（默认为空）
     timeout: 6000ms  # 连接超时时长（毫秒）
     jedis:
       pool:
diff --git a/wisenergy-web-admin/src/main/resources/application-test.yml b/wisenergy-web-admin/src/main/resources/application-test.yml
index e4fb385193b2711b7423e309105bcd67f3f9d41d..025839d475c51dc41c55469353e73bf9a8b537cd 100644
--- a/wisenergy-web-admin/src/main/resources/application-test.yml
+++ b/wisenergy-web-admin/src/main/resources/application-test.yml
@@ -3,9 +3,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/dydb?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
-      username: root
-      password: root
+      url: jdbc:mysql://39.97.107.31:3306/qunzhihe?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+      username: qunzhihe
+      password: j2kRn8HjrPez7trw
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -35,9 +35,9 @@ spring:
   redis:
     open: false  # 是否开启redis缓存  true开启   false关闭
     database: 0
-    host: localhost
+    host: 39.97.107.31
     port: 6379
-    password:    # 密码（默认为空）
+    password: 1qaz@WSX   # 密码（默认为空）
     timeout: 6000ms  # 连接超时时长（毫秒）
     jedis:
       pool: