Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
   captchaType: math
 # 文件服务地址和端口
 fileServer:
-  address: 116.142.80.13
+  address: 127.0.0.1
   port: 19002
 
 # 开发环境配置

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/WxUser.java

@@ -3,6 +3,8 @@ package com.ruoyi.common.core.domain.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.Setter;
 
 @TableName("jnb_wx_user")
 public class WxUser extends BaseEntity {
@@ -29,6 +31,9 @@ public class WxUser extends BaseEntity {
     @Excel(name = "手机号" )
     private String phone;
 
+    /** 头像（头像） */
+    private String headImg;
+
     public Long getId() {
         return id;
     }
@@ -76,4 +81,12 @@ public class WxUser extends BaseEntity {
     public void setPhone(String phone) {
         this.phone = phone;
     }
+
+    public String getHeadImg() {
+        return headImg;
+    }
+
+    public void setHeadImg(String headImg) {
+        this.headImg = headImg;
+    }
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -99,6 +99,8 @@ public class SysLoginService
             user.setWechatName("微信用户");
             user.setCreateBy(openid);
             user.setUpdateBy(openid);
+            //默认头像
+            user.setHeadImg(redisCache.getCacheObject(SYS_CONFIG_KEY + "head_img").toString());
             wxUserMapper.insert(user);
 
             //初始化积分

sooka-jnb/src/main/java/com/sooka/jnb/utils/PayUtils.java

@@ -13,11 +13,11 @@ public class PayUtils {
     /**
      * APPID
      */
-    public static String APPID = "wxf75b34dd1f737174";
+    public static String APPID = "wx0904bdfd9c082418";
     /**
      * secret
      */
-    public static String SECRET = "7918ea657e4143248beef3cc8718d339";
+    public static String SECRET = "9c7a0f50f3adb22d389b2428258d6fba";
     /**
      * 微信服务器地址
      */