PreventRepeatSubmit

bonus-api/bonus-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-api</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bonus-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bonus-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -0,0 +1,27 @@
+# Tomcat
+server: 
+  port: 18081
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_bns
+      config:
+        # 配置中心地址
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_bns
+        # 配置文件格式
+        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

@@ -1,7 +1,3 @@
-# Tomcat
-server: 
-  port: 18081
-
 # Spring
 spring: 
   application:
@@ -9,25 +5,6 @@ spring:
     name: bonus-auth
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    active: sgzb_bns_local
 
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
 

bonus-common/bonus-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/exception/BusinessException.java

@@ -0,0 +1,25 @@
+package com.bonus.common.core.exception;
+
+import com.bonus.common.core.utils.HttpCodeEnum;
+
+public class BusinessException extends RuntimeException {
+
+    private int code;
+    //使用枚举构造
+    public BusinessException(HttpCodeEnum httpCodeEnum){
+        super(httpCodeEnum.getMsg());
+        this.code=httpCodeEnum.getCode();
+    }
+    //使用自定义消息体
+    public BusinessException(HttpCodeEnum httpCodeEnum, String msg){
+        super(msg);
+        this.code=httpCodeEnum.getCode();
+    }
+
+    //根据异常构造
+    public BusinessException(HttpCodeEnum httpCodeEnum, Throwable msg){
+        super(msg);
+        this.code=httpCodeEnum.getCode();
+    }
+
+}

bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/HttpCodeEnum.java

@@ -0,0 +1,38 @@
+package com.bonus.common.core.utils;
+
+public enum HttpCodeEnum {
+    // 成功
+    SUCCESS(200, "操作成功"),
+    // 登录
+    NEED_LOGIN(401, "需要登录后操作"),
+    NO_OPERATOR_AUTH(403, "无权限操作"),
+    SYSTEM_ERROR(500, "出现错误"),
+    USERNAME_EXIST(501, "用户名已存在"),
+    PHONENUMBER_EXIST(502, "手机号已存在"),
+    EMAIL_EXIST(503, "邮箱已存在"),
+    REQUIRE_USERNAME(504, "必需填写用户名"),
+    CONTENT_NOT_NULL(506, "评论内容不能为空"),
+    FILE_TYPE_ERROR(507, "文件类型错误"),
+    USERNAME_NOT_NULL(508, "用户名不能为空"),
+    NICKNAME_NOT_NULL(509, "昵称不能为空"),
+    PASSWORD_NOT_NULL(510, "密码不能为空"),
+    EMAIL_NOT_NULL(511, "邮箱不能为空"),
+    NICKNAME_EXIST(512, "昵称已存在"),
+    LOGIN_ERROR(505, "用户名或密码错误"),
+    REPEATE_ERROR(600, "不允许重复提交，请稍候再试");
+    int code;
+    String msg;
+
+    HttpCodeEnum(int code, String errorMessage) {
+        this.code = code;
+        this.msg = errorMessage;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

bonus-common/bonus-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

bonus-common/bonus-common-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

bonus-common/bonus-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

bonus-common/bonus-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

bonus-common/bonus-common-seata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bonus-common/bonus-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/annotation/PreventRepeatSubmit.java

@@ -0,0 +1,24 @@
+package com.bonus.common.security.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义注解防止表单重复提交
+ *
+ */
+@Inherited
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface PreventRepeatSubmit
+{
+    /**
+     * 间隔时间(s)，小于此时间视为重复提交
+     */
+    public int interval() default 5;
+
+    /**
+     * 提示消息
+     */
+    public String message() default "不允许重复提交，请稍候再试";
+}

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/aspect/PreventRepeatSubmitAspect.java

@@ -0,0 +1,70 @@
+package com.bonus.common.security.aspect;
+
+import com.alibaba.fastjson2.JSON;
+import com.bonus.common.core.exception.BusinessException;
+import com.bonus.common.core.utils.HttpCodeEnum;
+import com.bonus.common.security.annotation.PreventRepeatSubmit;
+import com.bonus.common.security.utils.RedisCache;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+@Aspect
+@Component
+public class PreventRepeatSubmitAspect {
+    private static final Logger LOG = LoggerFactory.getLogger(PreventRepeatSubmitAspect.class);
+    private static final String header = "Authorization";
+
+    @Autowired
+    private RedisCache redisCache;
+
+    // 定义一个切入点
+    @Pointcut("@annotation(com.bonus.common.security.annotation.PreventRepeatSubmit)")
+    public void preventRepeatSubmit() {
+
+    }
+
+    @Around("preventRepeatSubmit()")
+    public Object checkPrs(ProceedingJoinPoint pjp) throws Throwable {
+        LOG.info("进入preventRepeatSubmit切面");
+        //得到request对象
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String requestURI = request.getRequestURI();
+        LOG.info("防重复提交的请求地址：{} ,请求方式：{}",requestURI,request.getMethod());
+        LOG.info("防重复提交拦截到的类名：{} ,方法：{}",pjp.getTarget().getClass().getSimpleName(),pjp.getSignature().getName());
+
+        //获取请求参数
+        Object[] args = pjp.getArgs();
+        String argStr = JSON.toJSONString(args);
+        //这里替换是为了在redis可视化工具中方便查看
+        argStr=argStr.replace(":","#");
+        // 唯一值（没有消息头则使用请求地址）
+        String submitKey = request.getHeader(header).trim();
+        // 唯一标识（指定key + url +参数+token）
+        String cacheRepeatKey = "repeat_submit:" + requestURI+":" +argStr+":"+ submitKey;
+        MethodSignature ms = (MethodSignature) pjp.getSignature();
+        Method method=ms.getMethod();
+        PreventRepeatSubmit preventRepeatSubmit=method.getAnnotation(PreventRepeatSubmit.class);
+        int interval = preventRepeatSubmit.interval();
+        LOG.info("获取到preventRepeatSubmit的有效期时间"+interval);
+        //redis分布式锁
+        Boolean aBoolean = redisCache.setNxCacheObject(cacheRepeatKey, 1, preventRepeatSubmit.interval(), TimeUnit.SECONDS);
+        //aBoolean为true则证明没有重复提交
+        if(!aBoolean){
+            throw new BusinessException(HttpCodeEnum.REPEATE_ERROR);
+        }
+        return pjp.proceed();
+    }
+
+}

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/RedisCache.java

@@ -0,0 +1,269 @@
+package com.bonus.common.security.utils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundSetOperations;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * spring redis 工具类
+ *
+ **/
+@Component
+public class RedisCache
+{
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    //添加分布式锁
+    public <T> Boolean setNxCacheObject(final String key, final T value,long lt,TimeUnit tu)
+    {
+        return redisTemplate.opsForValue().setIfAbsent(key,value,lt,tu);
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key 缓存的键值
+     * @param value 缓存的值
+     */
+    public <T> void setCacheObject(final String key, final T value)
+    {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key 缓存的键值
+     * @param value 缓存的值
+     * @param timeout 时间
+     * @param timeUnit 时间颗粒度
+     */
+    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
+    {
+        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key Redis键
+     * @param timeout 超时时间
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout)
+    {
+        return expire(key, timeout, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key Redis键
+     * @param timeout 超时时间
+     * @param unit 时间单位
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout, final TimeUnit unit)
+    {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 获取有效时间
+     *
+     * @param key Redis键
+     * @return 有效时间
+     */
+    public long getExpire(final String key)
+    {
+        return redisTemplate.getExpire(key);
+    }
+
+    /**
+     * 判断 key是否存在
+     *
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public Boolean hasKey(String key)
+    {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 获得缓存的基本对象。
+     *
+     * @param key 缓存键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> T getCacheObject(final String key)
+    {
+        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+        return operation.get(key);
+    }
+
+    /**
+     * 删除单个对象
+     *
+     * @param key
+     */
+    public boolean deleteObject(final String key)
+    {
+        return redisTemplate.delete(key);
+    }
+
+    /**
+     * 删除集合对象
+     *
+     * @param collection 多个对象
+     * @return
+     */
+    public boolean deleteObject(final Collection collection)
+    {
+        return redisTemplate.delete(collection) > 0;
+    }
+
+    /**
+     * 缓存List数据
+     *
+     * @param key 缓存的键值
+     * @param dataList 待缓存的List数据
+     * @return 缓存的对象
+     */
+    public <T> long setCacheList(final String key, final List<T> dataList)
+    {
+        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+        return count == null ? 0 : count;
+    }
+
+    /**
+     * 获得缓存的list对象
+     *
+     * @param key 缓存的键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> List<T> getCacheList(final String key)
+    {
+        return redisTemplate.opsForList().range(key, 0, -1);
+    }
+
+    /**
+     * 缓存Set
+     *
+     * @param key 缓存键值
+     * @param dataSet 缓存的数据
+     * @return 缓存数据的对象
+     */
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
+    {
+        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+        Iterator<T> it = dataSet.iterator();
+        while (it.hasNext())
+        {
+            setOperation.add(it.next());
+        }
+        return setOperation;
+    }
+
+    /**
+     * 获得缓存的set
+     *
+     * @param key
+     * @return
+     */
+    public <T> Set<T> getCacheSet(final String key)
+    {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 缓存Map
+     *
+     * @param key
+     * @param dataMap
+     */
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
+    {
+        if (dataMap != null) {
+            redisTemplate.opsForHash().putAll(key, dataMap);
+        }
+    }
+
+    /**
+     * 获得缓存的Map
+     *
+     * @param key
+     * @return
+     */
+    public <T> Map<String, T> getCacheMap(final String key)
+    {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 往Hash中存入数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @param value 值
+     */
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
+    {
+        redisTemplate.opsForHash().put(key, hKey, value);
+    }
+
+    /**
+     * 获取Hash中的数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @return Hash中的对象
+     */
+    public <T> T getCacheMapValue(final String key, final String hKey)
+    {
+        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
+        return opsForHash.get(key, hKey);
+    }
+
+    /**
+     * 获取多个Hash中的数据
+     *
+     * @param key Redis键
+     * @param hKeys Hash键集合
+     * @return Hash对象集合
+     */
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
+    {
+        return redisTemplate.opsForHash().multiGet(key, hKeys);
+    }
+
+    /**
+     * 删除Hash中的某条数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @return 是否成功
+     */
+    public boolean deleteCacheMapValue(final String key, final String hKey)
+    {
+        return redisTemplate.opsForHash().delete(key, hKey) > 0;
+    }
+
+    /**
+     * 获得缓存的基本对象列表
+     *
+     * @param pattern 字符串前缀
+     * @return 对象列表
+     */
+    public Collection<String> keys(final String pattern)
+    {
+        return redisTemplate.keys(pattern);
+    }
+}

bonus-common/bonus-common-sensitive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

bonus-common/bonus-common-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-common</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -30,5 +30,5 @@
             <version>${swagger.fox.version}</version>
         </dependency>
 
-	</dependencies>
+    </dependencies>
 </project>

bonus-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bonus-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -86,6 +86,12 @@
             <artifactId>springfox-swagger2</artifactId>
             <version>${swagger.fox.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-ui</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+
         <!--加密依赖包-->
         <dependency>
             <groupId>com.github.ulisesbocchio</groupId>

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

@@ -0,0 +1,43 @@
+# Tomcat
+server:
+  port: 18080
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_bns
+      config:
+        # 配置中心地址
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_bns
+        # 配置文件格式
+        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

@@ -1,6 +1,3 @@
-# Tomcat
-server:
-  port: 18080
 # Spring
 spring:
   application:
@@ -8,41 +5,4 @@ spring:
     name: bonus-gateway
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 192.168.0.14:18858
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: 192.168.0.14:8848
-            namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-            dataId: sentinel-bonus-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow
-
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
-
+    active: sgzb_bns_local

bonus-modules/bonus-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-modules</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

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

@@ -1,7 +1,3 @@
-# Tomcat
-server:
-  port: 9300
-
 # Spring
 spring: 
   application:
@@ -13,19 +9,4 @@ spring:
 #      max-request-size: 5GB
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    active: sgzb_bns_local

bonus-modules/bonus-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-modules</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -0,0 +1,21 @@
+# Tomcat
+server:
+  port: 9202
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.0.56:8848
+        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+      config:
+        # 配置中心地址
+        server-addr: 192.168.0.56:8848
+        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

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

@@ -1,7 +1,3 @@
-# Tomcat
-server:
-  port: 9202
-
 # Spring
 spring: 
   application:
@@ -9,19 +5,4 @@ spring:
     name: bonus-gen
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    active: sgzb_bns_local

bonus-modules/bonus-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-modules</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -0,0 +1,21 @@
+# Tomcat
+server:
+  port: 9203
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.0.56:8848
+        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+      config:
+        # 配置中心地址
+        server-addr: 192.168.0.56:8848
+        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

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

@@ -1,7 +1,3 @@
-# Tomcat
-server:
-  port: 9203
-
 # Spring
 spring: 
   application:
@@ -9,19 +5,4 @@ spring:
     name: bonus-job
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.56:8848
-        namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    active: sgzb_bns_local

bonus-modules/bonus-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-modules</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

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

@@ -0,0 +1,28 @@
+# Tomcat
+server:
+  port: 18082
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+        #        namespace: sgzb_bns
+        namespace: sgzb_bns
+      config:
+        # 配置中心地址
+        server-addr: 127.0.0.1:8848
+        #        namespace: sgzb_bns
+        namespace: sgzb_bns
+        # 配置文件格式
+        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

@@ -1,7 +1,3 @@
-# Tomcat
-server:
-  port: 18082
-
 # Spring
 spring: 
   application:
@@ -9,27 +5,4 @@ spring:
     name: bonus-system
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-#        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-#        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
-
+    active: sgzb_bns_local

bonus-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bonus-visual/bonus-monitor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus-visual</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

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

@@ -9,17 +9,17 @@ spring:
     name: bonus-monitor
   profiles:
     # 环境配置
-    active: dev
+    active: sgzb_bns_local
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_bns
       config:
         # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: f648524d-0a7b-449e-8f92-64e05236fd51
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_bns
         # 配置文件格式
         file-extension: yml
         # 共享配置

bonus-visual/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bonus</groupId>
         <artifactId>bonus</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.bonus</groupId>
     <artifactId>bonus</artifactId>
-    <version>24.9.0-SNAPSHOT</version>
+    <version>24.8.0</version>
 
     <name>bonus</name>
     <url>http://www.ahbonus.cn</url>
     <description>博诺思微服务系统</description>
 
     <properties>
-        <bonus.version>24.9.0-SNAPSHOT</bonus.version>
+        <bonus.version>24.8.0</bonus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -97,6 +97,16 @@
                 <artifactId>swagger-annotations</artifactId>
                 <version>${swagger.core.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-spring-boot-starter</artifactId>
+                <version>3.0.3</version>
+            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.github.xiaoymin</groupId>-->
+<!--                <artifactId>knife4j-spring-boot-autoconfigure</artifactId>-->
+<!--                <version>3.0.3</version>-->
+<!--            </dependency>-->
 
             <!-- 验证码 -->
             <dependency>

scripts/auth_bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: bonus-auth
   profiles:
     # 环境配置
-    active: dev
+    active: local
   cloud:
     nacos:
       discovery:

scripts/file_bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: bonus-file
   profiles:
     # 环境配置
-    active: dev
+    active: local
   cloud:
     nacos:
       discovery:

scripts/gateway_bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: bonus-gateway
   profiles:
     # 环境配置
-    active: dev
+    active: local
   cloud:
     nacos:
       discovery:
@@ -31,7 +31,7 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 192.168.0.14:18858
+        dashboard: 127.0.0.1:18858
       # nacos配置持久化
       datasource:
         ds1:

scripts/gen_bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: bonus-gen
   profiles:
     # 环境配置
-    active: dev
+    active: local
   cloud:
     nacos:
       discovery:

scripts/job_bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: bonus-job
   profiles:
     # 环境配置
-    active: dev
+    active: local
   cloud:
     nacos:
       discovery:

scripts/system_bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: bonus-system
   profiles:
     # 环境配置
-    active: dev
+    active: local
   cloud:
     nacos:
       discovery:

scripts/visual_bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: bonus-monitor
   profiles:
     # 环境配置
-    active: dev
+    active: local
   cloud:
     nacos:
       discovery: