Merge branch 'develop'

pom.xml

@@ -35,6 +35,7 @@
         <mybatis-plus.version>3.3.2</mybatis-plus.version>
         <knife4j.version>3.0.2</knife4j.version>
         <tx.version>5.2.12.RELEASE</tx.version>
+        <nacos-config-spring-boot.version>0.2.7</nacos-config-spring-boot.version>
     </properties>
     <dependencies>
         <dependency>
@@ -180,6 +181,12 @@
             <artifactId>spring-tx</artifactId>
             <version>${tx.version}</version>
         </dependency>
+        <!-- nacos-config -->
+        <dependency>
+            <groupId>com.alibaba.boot</groupId>
+            <artifactId>nacos-config-spring-boot-starter</artifactId>
+            <version>${nacos-config-spring-boot.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/syc/slm/slmbi/SlmBiApplication.java

 package com.syc.slm.slmbi;
 
+import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 @MapperScan("com.syc.**.dao")
+@NacosPropertySource(dataId = "slm-bi-base.yaml", autoRefreshed = true)
+@NacosPropertySource(dataId = "slm-bi-data.yaml", autoRefreshed = true)
 @SpringBootApplication
 public class SlmBiApplication {
 

src/main/resources/application-dev.yml

 spring:
-  datasource:
-    username: syc_dev
-    password: Test123!
-    url: jdbc:mysql://${MYSQL_HOST:116.63.67.122}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
-dc_client:
-  host: http://139.9.194.252:2400/dc #http://139.9.194.252:2400/dc  # http://192.168.0.3:2400/dc  # http://apidev.sycdev.com/dc
+  profiles:
+    active: dev
+nacos:
+  config:
+    server-addr: 116.63.67.122:8849
+    # nacos访问地址的用户名
\ No newline at end of file
+    username: syc_reader
+    # nacos访问地址的密码
+    password: syc@123
+    namespace: f0a7522b-34dc-4de9-8da5-448b91fe468b
+
+

src/main/resources/application-pre.yml

+spring:
+  profiles:
+    active: pre
+nacos:
+  config:
+    server-addr: 116.63.67.122:8849
+    # nacos访问地址的用户名
+    username: syc_reader
+    # nacos访问地址的密码
+    password: syc@123
+    namespace: 06155d6f-fced-4ba8-aabc-4ba90ae29996
\ No newline at end of file

src/main/resources/application-prod.yml

+spring:
+  profiles:
+    active: prod
+nacos:
+  config:
+    server-addr: 192.168.0.21:98
+    # nacos访问地址的用户名
+    username: syc_reader
+    # nacos访问地址的密码
+    password: sYc$123!12
+    namespace: 4683e897-e0be-44a6-abcc-4671075d1e69
\ No newline at end of file

src/main/resources/application-test.yml

 spring:
-  datasource:
-    username: syc_test
-    password: Test123!
-    url: jdbc:mysql://${MYSQL_HOST:syc-test-001}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
-dc_client:
-  host: http://192.168.0.186:2400/dc #http://139.9.194.252:2400/dc  # http://192.168.0.3:2400/dc  # http://apidev.sycdev.com/dc
+  profiles:
+    active: test
+nacos:
+  config:
+    server-addr: 116.63.67.122:8849
+    # nacos访问地址的用户名
\ No newline at end of file
+    username: syc_reader
+    # nacos访问地址的密码
+    password: syc@123
+    namespace: b27c6547-21ca-4429-b0d6-a2c8b290a917
\ No newline at end of file

src/main/resources/application.yml

 spring:
-  application:
-    name: slm-bi
   profiles:
-    active:
-      - dev
-  freemarker:
-    cache: false
-    template-loader-path: classpath:/templates/ftl/
-    charset: utf-8
-    check-template-location: true
-    content-type: text/html
-    expose-request-attributes: true
-    expose-session-attributes: true
-    request-context-attribute: request
-    suffix: .ftl
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    hikari:
-      minimum-idle: 10
-      maximum-pool-size: 200
-      auto-commit: true
-      connection-test-query: SELECT 1
-      idle-timeout: 30000
-      pool-name: HikariCP
-      max-lifetime: 1800000
-      connection-timeout: 30000
-  messages:
-    basename: i18n/messages,i18n/sys
+    active: test
 
-mybatis-plus:
-  dialect: mysql
-  configuration:
-    jdbc-type-for-null: null
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:/mapper/${mybatis-plus.dialect}/*.xml,classpath*:/mapper/${mybatis-plus.dialect}/**/*.xml
-  typeAliasesPackage: com.yeshirow.**.entity
-  global-config:
-    db-config:
-      id-type: uuid
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-server:
-  servlet:
-    context-path: /bi
-  port: 2022
-logging:
-  config: classpath:logback.xml
-  syc-level: debug
-
-dc_client:
-  interfaces:
-    positionListUrl: /{appId}/positions?positionName={positionName}
-    deptListUrl: /{appId}/departments?deptName={deptName}
-    userTree : /{appId}/users/list?userName={userName}
-    variableList : /{appId}/variables/slm/tag/list?token={token}&from={from}&varType={varType}&type={type}&equipmentId={equipmentId}&customerId={customerId}&name={name}&desc={desc}&unit={unit}&keyword={keyword}&isCustomer={isCustomer}&current={current}&size={size}
-    deviceList : /{appId}/variables/device?token={token}&equipment_info_id={equipment_info_id}&q_name={q_name}&search_code={search_code}&warranty_status={warranty_status}&page_num={page_num}&page_size={page_size}
-    deptsRoles : /{appId}/users/depts-roles
-    businessFiledData : /{appId}/business/filed
-    businessDataFieldStatistics: /{appId}/business/data/field/statistics
-    # variableHistoryDataList: /{appId}/variables/history?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&statisticsType={statisticsType}&variableCode={variableCode}&variableId={variableId}&x={x}&format={format}
-    # variableRealTimeDataList: /{appId}/variables/real-time?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&variableCode={variableCode}&variableId={variableId}&format={format}
-    variableCodeHistoryList: /{appId}/variables/variable-code/history
-    variableAllDataList: /{appId}/variables/time-period/data
-    realTimeVariableDataList: /{appId}/variables/real-time/data
-    filedValue : /{appId}/business/{tableName}/{filed}/filed-value?current={current}&size={size}&name={name}       #/{appId}/business/{tableName}/{filed}/filed-value?current={current}&size={size}&name={name}
-    send : /{appId}/variables/monitor/device/commands
-    variableStatus : /{appId}/variables/{deviceId}/{variableId}/{variableCode}/status
-    variableHistoryStatus : /{appId}/variables/{deviceId}/{variableCode}/history-status?startTime={startTime}&endTime={endTime}
-    # historyCurve : /{appId}/variables/history-curve?deviceId={deviceId}&endTime={endTime}&startTime={startTime}&variableCode={variableCode}&variableId={variableId}&format={format}
-    # historyCurve : /{appId}/variables/history-curve
-    permissionCodeUrl : /{appId}/bi/permission/code
-    variableStatusRealTimeDataList: /{appId}/variables/status/real-time/data
-    companyAppId: /{appId}/bi/company/init/app-id
+# 默认本地调试地址
+#dc_client:
+#  host: http://localhost:2400/dc
\ No newline at end of file

src/main/resources/bootstrap.yml

+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      minimum-idle: 10
+      maximum-pool-size: 200
+      auto-commit: true
+      connection-test-query: SELECT 1
+      idle-timeout: 30000
+      pool-name: HikariCP
+      max-lifetime: 1800000
+      connection-timeout: 30000
\ No newline at end of file