diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java b/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java
index a6b7154b..0e3fec33 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/security/service/JwtUserDetailsService.java
@@ -5,6 +5,7 @@ import co.yixiang.modules.security.security.JwtUser;
 import co.yixiang.modules.user.entity.YxUser;
 import co.yixiang.modules.user.service.YxUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
@@ -30,10 +31,10 @@ public class JwtUserDetailsService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username){
-        System.out.println("username:"+username);
+        System.out.println("username2:"+username);
         YxUser user = yxUserService.findByName(username);
         if (user == null) {
-            throw new BadRequestException("账号不存在");
+            throw new BadRequestException(HttpStatus.UNAUTHORIZED,"账号不存在");
         } else {
             return createJwtUser(user);
         }
diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java
index b428a7fb..fa30ef24 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserAddressController.java
@@ -98,7 +98,7 @@ public class UserAddressController extends BaseController {
     /**
     * 删除用户地址
     */
-    @PostMapping("/delete")
+    @PostMapping("/address/del")
     @ApiOperation(value = "删除用户地址",notes = "删除用户地址",response = ApiResult.class)
     public ApiResult<Boolean> deleteYxUserAddress(@Valid @RequestBody IdParam idParam){
         YxUserAddress userAddress = new YxUserAddress();
diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
index 15d76f42..2cb85b0b 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
@@ -15,6 +15,7 @@ import co.yixiang.modules.user.entity.YxWechatUser;
 import co.yixiang.modules.user.mapper.YxUserMapper;
 import co.yixiang.modules.user.service.YxUserService;
 import co.yixiang.modules.user.service.YxWechatUserService;
+import co.yixiang.modules.user.web.vo.YxUserQueryVo;
 import co.yixiang.utils.EncryptUtils;
 import co.yixiang.utils.OrderUtil;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
@@ -105,16 +106,22 @@ public class WechatController extends BaseController {
         //String url = "https://h5.dayouqiantu.cn/";
         //wxService.oauth2buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, null);
 
-
         try {
             WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxService.oauth2getAccessToken(code);
             WxMpUser wxMpUser = wxService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
             String openid = wxMpUser.getOpenId();
             YxWechatUser wechatUser = wechatUserService.getUserInfo(openid);;
+            YxUserQueryVo yxUserQueryVo = userService.getYxUserById(wechatUser.getUid());
             JwtUser jwtUser = null;
-            if(ObjectUtil.isNotNull(wechatUser)){
+            if(ObjectUtil.isNotNull(wechatUser) && ObjectUtil.isNotNull(yxUserQueryVo)){
                 jwtUser = (JwtUser) userDetailsService.loadUserByUsername(wechatUser.getOpenid());
             }else{
+                if(ObjectUtil.isNotNull(wechatUser)){
+                    wechatUserService.removeById(wechatUser.getUid());
+                }
+                if(ObjectUtil.isNotNull(yxUserQueryVo)){
+                    userService.removeById(yxUserQueryVo.getUid());
+                }
                 //用户保存
                 YxUser user = new YxUser();
                 user.setAccount(wxMpUser.getNickname());
diff --git a/yshop-api/src/main/resources/config/application-prod.yml b/yshop-api/src/main/resources/config/application-prod.yml
index 8439c468..6aa97225 100644
--- a/yshop-api/src/main/resources/config/application-prod.yml
+++ b/yshop-api/src/main/resources/config/application-prod.yml
@@ -6,7 +6,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: yshop
-      password:
+      password: 
 
       # 初始化配置
       initial-size: 3
diff --git a/yshop-api/src/main/resources/config/application.yml b/yshop-api/src/main/resources/config/application.yml
index 45822824..51bd990c 100644
--- a/yshop-api/src/main/resources/config/application.yml
+++ b/yshop-api/src/main/resources/config/application.yml
@@ -63,6 +63,12 @@ wx:
     subAppId:
     subMchId:
     keyPath:
+  miniapp:
+    appid: wxa82b5b7fcb0ec161
+    secret:
+    token:
+    aesKey:
+    msgDataFormat: JSON
 logging:
   level:
     org.springframework.web: INFO
diff --git a/yshop-mp/pom.xml b/yshop-mp/pom.xml
index 019c3a65..a9692b32 100644
--- a/yshop-mp/pom.xml
+++ b/yshop-mp/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>wx-java-pay-spring-boot-starter</artifactId>
             <version>3.5.0</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.binarywang</groupId>-->
+<!--            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>-->
+<!--            <version>3.5.0</version>-->
+<!--        </dependency>-->
     </dependencies>
 
 
diff --git a/yshop-system/src/main/resources/config/application.yml b/yshop-system/src/main/resources/config/application.yml
index 95c491b2..f2b6be8c 100644
--- a/yshop-system/src/main/resources/config/application.yml
+++ b/yshop-system/src/main/resources/config/application.yml
@@ -42,3 +42,9 @@ wx:
         secret:
         token: yshop
         aesKey: yYuBUkC8BXImCXyu7O6hkzLj4TC5nxsWPfL4CQAZPNY
+#  miniapp:
+#    appid: wx604d2ea4702620d2
+#    secret:
+#    token:
+#    aesKey:
+#    msgDataFormat: JSON