整合成功

usky-modules-demo-biz/pom.xml

@@ -13,23 +13,23 @@
 
 
     <dependencies>
-<!--        &lt;!&ndash; SpringCloud Alibaba Nacos &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
-<!--        </dependency>-->
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
 
-<!--        &lt;!&ndash; SpringCloud Alibaba Nacos Config &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
-<!--        </dependency>-->
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
 
-<!--        &lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>-->
-<!--        </dependency>-->
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
 
         <!-- SpringBoot Actuator -->
         <dependency>

usky-modules-demo-biz/src/main/java/com/usky/demo/controller/web/SysUserController.java

@@ -1,9 +1,18 @@
 package com.usky.demo.controller.web;
 
 
+import com.usky.common.core.bean.ApiResult;
+import com.usky.demo.domain.SysUser;
+import com.usky.demo.service.SysUserService;
+import com.usky.demo.service.impl.SysUserServiceImpl;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +22,17 @@ import org.springframework.stereotype.Controller;
  * @author ya
  * @since 2022-04-20
  */
-@Controller
+@RestController
 @RequestMapping("/sysUser")
 public class SysUserController {
 
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @RequestMapping("/list")
+    public ApiResult<List<SysUser>> getList(){
+        return ApiResult.success(sysUserService.list());
+    }
 }
 

usky-modules-demo-biz/src/main/resources/application-dev.properties

@@ -1,109 +0,0 @@
-debug=true
-spring.main.lazy-initialization=false
-spring.main.allow-bean-definition-overriding=true
-# application
-server.port=8084
-# mybatis-plus
-mybatis-plus.mapper-locations=classpath*:mapper/**/*.xml
-mybatis-plus.configuration.lazy-loading-enabled=true
-mybatis-plus.configuration.map-underscore-to-camel-case=true
-mybatis-plus.global-config.db-config.id-type=auto
-mybatis-plus.global-config.mapperRegistryCache=true
-mybatis-plus.configuration.defaultStatementTimeout=3
-mybatis.refresh.enabled=true
-mybatis.refresh.delay-seconds=10
-mybatis.refresh.sleep-seconds=20
-# datasource
-spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-spring.datasource.dynamic.primary=mast
-spring.datasource.dynamic.datasource.mast.url=jdbc:mysql://47.111.81.118:3306/dm?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
-spring.datasource.dynamic.datasource.mast.username=root
-spring.datasource.dynamic.datasource.mast.password=Yt2021
-spring.datasource.dynamic.druid.initial-size=5                                                                       
-spring.datasource.dynamic.druid.min-idle=5
-spring.datasource.dynamic.druid.max-active=30
-spring.datasource.dynamic.druid.max-wait=60000
-spring.datasource.dynamic.druid.validation-query=select 1
-spring.datasource.dynamic.druid.test-while-idle=true
-spring.datasource.dynamic.druid.test-on-borrow=true
-spring.datasource.dynamic.druid.test-on-return=false
-spring.datasource.dynamic.druid.pool-prepared-statements=true
-spring.datasource.dynamic.druid.max-pool-prepared-statement-per-connection-size=20
-spring.datasource.dynamic.druid.time-between-eviction-runs-millis=60000
-spring.datasource.dynamic.druid.min-evictable-idle-time-millis=300000
-spring.datasource.dynamic.druid.filters=wall,stat,log4j2
-# druid \u76D1\u63A7 WebStatFilter\u914D\u7F6E
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.web-stat-filter.url-pattern=/*
-spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*
-spring.datasource.druid.web-stat-filter.profile-enable=true
-# druid \u89C6\u56FE StatViewServlet\u914D\u7F6E
-spring.datasource.druid.stat-view-servlet.enabled=true
-spring.datasource.druid.stat-view-servlet.url-pattern=/druid/*
-spring.datasource.druid.stat-view-servlet.reset-enable=true
-spring.datasource.druid.stat-view-servlet.login-username=admin
-spring.datasource.druid.stat-view-servlet.login-password=@dmin1234
-# datasource log
-spring.datasource.druid.filter.slf4j.enabled=true
-spring.datasource.druid.filter.slf4j.statement-create-after-log-enabled=false
-spring.datasource.druid.filter.slf4j.statement-close-after-log-enabled=false
-spring.datasource.druid.filter.slf4j.result-set-open-after-log-enabled=false
-spring.datasource.druid.filter.slf4j.result-set-close-after-log-enabled=false
-# jackson
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-spring.jackson.default-property-inclusion=always
-#spring.jackson.serialization.indent_output=true
-spring.jackson.serialization.fail-on-empty-beans=false
-spring.jackson.deserialization.fail-on-unknown-properties=false
-spring.jackson.parser.allow-unquoted-control-chars=true
-spring.jackson.parser.allow-single-quotes=true
-# gzip
-server.compression.enabled=true
-server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
-
-# ehcache
-spring.cache.ehcache.enabled=true
-spring.cache.ehcache.config=classpath:ehcache.xml
-# redis
-spring.cache.redis.enabled=true
-spring.redis.database=0
-spring.redis.host=47.111.81.118
-spring.redis.port=6379
-spring.redis.password=uskyredis
-spring.redis.timeout=10000
-spring.redis.jedis.pool.max-active=1000
-spring.redis.jedis.pool.max-idle=300
-spring.redis.jedis.pool.min-idle=5
-spring.redis.jedis.pool.max-wait=1000
-
-# token
-token.header: Authorization
-token.secret: abcdefghijklmnopqrstuvwxyz
-token.expireTime: 144
-
-# xss
-xss.enabled: true
-xss.excludes: /system/notice
-xss.urlPatterns: /system/*,/monitor/*,/tool/*
-
-# project
-wj.name: yq
-wj.version: 3.6.0
-wj.copyrightYear: 2021
-wj.demoEnabled: true
-wj.addressEnabled: false
-wj.captchaType: math
-wj.codeEnabled: false
-
-spring.messages.basename= i18n/messages
-
-temp.basedir=C:/Users/yq/Desktop/
-
-
-#mqttt
-mqtt.completionTimeout=5000
-mqtt.keep-alive-interval=60
-mqtt.username=usky
-mqtt.password=usky
-mqtt.url=tcp://47.98.201.73:1883

usky-modules-demo-biz/src/main/resources/application.properties

@@ -1,5 +0,0 @@
-# common
-spring.profiles.active=dev
-spring.application.name=test
-spring.main.banner-mode=off
-mybatis-plus.global-config.banner=false

usky-modules-demo-biz/src/main/resources/bootstrap.yml

@@ -1,25 +1,25 @@
-## Tomcat
-#server:
-#  port: 8884
-#
-## Spring
-#spring:
-#  application:
-#    # 应用名称
-#    name: uksy-demo
-#  profiles:
-#    # 环境配置
-#    active: dev
-#  cloud:
-#    nacos:
-#      discovery:
-#        # 服务注册地址
-#        server-addr: 101.133.214.75:8848
-#      config:
-#        # 配置中心地址
-#        server-addr: 101.133.214.75:8848
-#        # 配置文件格式
-#        file-extension: yml
-#        # 共享配置
-#        shared-configs:
-#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+# Tomcat
+server:
+  port: 9886
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: usky-demo
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 101.133.214.75:8848
+      config:
+        # 配置中心地址
+        server-addr: 101.133.214.75:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}