From 5aef7628cffb2ca972137de756c22112c7d6e341 Mon Sep 17 00:00:00 2001
From: zhouzhou <754746838@qq.com>
Date: Thu, 21 Dec 2023 13:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=80=832?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/encodings.xml | 1 +
.idea/workspace.xml | 119 ++++++++++++++++--
bwie-auth/src/main/resources/bootstrap.yml | 3 +-
.../java/com/bwie/common/domain/User.java | 1 +
.../bwie/common/domain/request/Userlogin.java | 28 ++++-
.../src/main/resources/bootstrap.yml | 4 +-
bwie-modules/pom.xml | 1 +
7 files changed, 141 insertions(+), 16 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 8d0cc94..c8a1eab 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,6 +5,7 @@
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ef46e7b..8354c85 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,15 +5,28 @@
+
-
+
+
+
+
+
+
+
+
@@ -34,30 +47,119 @@
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -74,6 +176,7 @@
+
diff --git a/bwie-auth/src/main/resources/bootstrap.yml b/bwie-auth/src/main/resources/bootstrap.yml
index 896eabd..06ee80a 100644
--- a/bwie-auth/src/main/resources/bootstrap.yml
+++ b/bwie-auth/src/main/resources/bootstrap.yml
@@ -19,6 +19,7 @@ spring:
discovery:
# 服务注册地址
server-addr: 124.223.114.120:8848
+ namespace: ea6d16de-21aa-4c9e-81af-0d5836cdc10c
config:
# 配置中心地址
server-addr: 124.223.114.120:8848
@@ -27,4 +28,4 @@ spring:
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
+ namespace: ea6d16de-21aa-4c9e-81af-0d5836cdc10c
diff --git a/bwie-common/src/main/java/com/bwie/common/domain/User.java b/bwie-common/src/main/java/com/bwie/common/domain/User.java
index 5aab2dd..5e2ac0e 100644
--- a/bwie-common/src/main/java/com/bwie/common/domain/User.java
+++ b/bwie-common/src/main/java/com/bwie/common/domain/User.java
@@ -10,6 +10,7 @@ public class User {
private String code;
private String token;
+ private Integer userNum;
private String userPwd;
private String phone;
diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/Userlogin.java b/bwie-common/src/main/java/com/bwie/common/domain/request/Userlogin.java
index 2c5fe03..543c749 100644
--- a/bwie-common/src/main/java/com/bwie/common/domain/request/Userlogin.java
+++ b/bwie-common/src/main/java/com/bwie/common/domain/request/Userlogin.java
@@ -1,4 +1,4 @@
-package com.bw.common.domain.request;
+package com.bwie.common.domain.request;
import lombok.Data;
@@ -9,16 +9,32 @@ import lombok.Data;
* @Date 2023/10/19 9:16
*/
@Data
-public class Userlogin {
+public class UserLogin {
private String phone;
- private String code;
+ private String pwd;
- public Userlogin(String phone, String code) {
+ public UserLogin(String phone, String pwd) {
this.phone = phone;
- this.code = code;
+ this.pwd = pwd;
}
- public Userlogin() {
+ public UserLogin() {
}
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getPwd() {
+ return pwd;
+ }
+
+ public void setPwd(String pwd) {
+ this.pwd = pwd;
+ }
}
diff --git a/bwie-modules/bwie-user/src/main/resources/bootstrap.yml b/bwie-modules/bwie-user/src/main/resources/bootstrap.yml
index 7b825cf..56cd6bd 100644
--- a/bwie-modules/bwie-user/src/main/resources/bootstrap.yml
+++ b/bwie-modules/bwie-user/src/main/resources/bootstrap.yml
@@ -19,6 +19,7 @@ spring:
discovery:
# 服务注册地址
server-addr: 124.223.114.120:8848
+ namespace: ea6d16de-21aa-4c9e-81af-0d5836cdc10c
config:
# 配置中心地址
server-addr: 124.223.114.120:8848
@@ -27,6 +28,7 @@ spring:
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ namespace: ea6d16de-21aa-4c9e-81af-0d5836cdc10c
fdfs:
so-timeout: 1500 # socket 连接时长
connect-timeout: 600 # 连接 tracker 服务器超时时长
@@ -38,4 +40,4 @@ fdfs:
# 生成缩略图
thumb-image:
height: 500
- width: 500
\ No newline at end of file
+ width: 500
diff --git a/bwie-modules/pom.xml b/bwie-modules/pom.xml
index 3dd0856..26550ec 100644
--- a/bwie-modules/pom.xml
+++ b/bwie-modules/pom.xml
@@ -13,6 +13,7 @@
pom
bwie-user
+ bwie-product