LoginUser

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/LoginUser.java

@@ -3,6 +3,8 @@ package com.bonus.system.api.model;
 import java.io.Serializable;
 import java.util.Set;
 import com.bonus.system.api.domain.SysUser;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 用户信息
@@ -58,6 +60,18 @@ public class LoginUser implements Serializable
      */
     private SysUser sysUser;
 
+    private Long custId;
+
+    private String openId;
+
+    private String nickName;
+
+    private String photoUrl;
+
+    private String phonenumber;
+
+    private String password;
+
     public String getToken()
     {
         return token;
@@ -147,4 +161,52 @@ public class LoginUser implements Serializable
     {
         this.sysUser = sysUser;
     }
+
+    public Long getCustId() {
+        return custId;
+    }
+
+    public void setCustId(Long custId) {
+        this.custId = custId;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getPhotoUrl() {
+        return photoUrl;
+    }
+
+    public void setPhotoUrl(String photoUrl) {
+        this.photoUrl = photoUrl;
+    }
+
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
 }

bonus-auth/src/main/resources/bootstrap-jyy_canteen_local.yml

@@ -1,27 +0,0 @@
-# Tomcat
-server: 
-  port: 58081
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
-

bonus-auth/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: bonus-auth
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
 
 #加密组件
 jasypt:

bonus-gateway/src/main/java/com/bonus/gateway/config/GlobalCorsConfig.java

@@ -0,0 +1,33 @@
+package com.bonus.gateway.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+import org.springframework.web.util.pattern.PathPatternParser;
+
+/**
+ * Description： 全局跨域配置
+ */
+@Configuration
+public class GlobalCorsConfig {
+    @Bean
+    public CorsWebFilter corsFilter() {
+        // 创建一个新的CorsConfiguration对象，用于配置跨域请求
+        CorsConfiguration config = new CorsConfiguration();
+        // 允许所有的HTTP请求方法（GET, POST, PUT, DELETE等）
+        config.addAllowedMethod("*");
+        // 允许所有的域名发起的请求 比如http://localhost:8080、
+        config.addAllowedOrigin("*");
+        // 允许所有的域名发起的请求（支持正则表达式） 比如http://localhost:8080
+        config.addAllowedOriginPattern("*");
+        // 允许所有的请求头部信息 比如token、Content-Type
+        config.addAllowedHeader("*");
+        // 创建一个UrlBasedCorsConfigurationSource对象，并使用PathPatternParser进行路径匹配
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
+        // 注册跨域配置，应用于所有的URL路径
+        source.registerCorsConfiguration("/**", config);
+        return new CorsWebFilter(source);
+    }
+}

bonus-gateway/src/main/resources/bootstrap-jyy_canteen_local.yml

@@ -1,43 +0,0 @@
-# Tomcat
-server:
-  port: 58080
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 127.0.0.1:18858
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: 127.0.0.1:8848
-            namespace: sgzb_bns
-            dataId: sentinel-bonus-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow
-
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
-

bonus-gateway/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: bonus-gateway
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
 
 #加密组件
 jasypt:

bonus-modules/bonus-face/src/main/resources/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
     name: bonus-face
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
   cloud:
     nacos:
       discovery:

bonus-modules/bonus-file/src/main/resources/bootstrap-jyy_canteen_local.yml

@@ -1,21 +0,0 @@
-# Tomcat
-server:
-  port: 59300
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

bonus-modules/bonus-file/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
 
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
 
 #加密组件
 jasypt:

bonus-modules/bonus-gen/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: bonus-gen
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
 
 #加密组件
 jasypt:

bonus-modules/bonus-job/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: bonus-job
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
 
 #加密组件
 jasypt:

bonus-modules/bonus-system/src/main/resources/bootstrap-jyy_canteen_local.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 58082
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt

bonus-modules/bonus-system/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: bonus-system
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
   task:
     scheduling:
       pool:

bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: bonus-monitor
   profiles:
     # 环境配置
-    active: dev
+    active: smart_canteen_local
 
 #加密组件
 jasypt: