Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application-prod.yml

.idea/.gitignore

@@ -6,3 +6,4 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+../.idea

.idea/jarRepositories.xml

@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://172.20.32.233:30005/repository/hnxjy-maven/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -16,5 +21,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

pom.xml

@@ -26,6 +26,11 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <version>2021.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2021.1</version>
+        </dependency>
 
         <dependency>
         <groupId>javax.validation</groupId>

src/main/resources/application-dev.yml

@@ -1,90 +0,0 @@
-server:
-  port: 8081
-es-url:
-  127.0.0.1:9200
-spring:
-
-  config:
-    activate:
-      on-profile: dev
-
-  application:
-    # 应用名称
-    name: softbot
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        username: nacos
-        password: nacos
-
-
-  datasource:
-    username: root
-    password: 123456 #tonglin0711
-    url: jdbc:mysql://localhost:3306/testforgeplus?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    dbcp2:
-      test-on-borrow: false
-      test-while-idle: true
-      time-between-eviction-runs-millis: 3600000
-
-  elasticsearch:
-    rest:
-      uris: http://127.0.0.1:9200
-  devtools:
-    restart:
-
-      enabled: true
-
-      additional-paths: src/main/java
-
-      poll-interval: 3000
-      quiet-period: 1000
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  mvc:
-    view:
-      prefix: /WEB-INF/jsp/
-      suffix: .jsp
-  thymeleaf:
-    prefix: classpath:/templates/
-    suffix: .html
-    encoding: UTF-8
-  redis:
-    database: 0
-    host: 101.35.140.79
-    port: 6379
-    # password:
-    # 连接超时时间
-    timeout: 10000
-    password: 123456
-
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath:mapper/*.xml
-
-
-mybatis:
-  mapper-locations: classpath:mapper/*.xml
-  type-aliases-package: com.gitlink.softbot.entity
-  configuration:
-    map-underscore-to-camel-case: true
-
-#showSql
-logging:
-  level:
-    com:
-      example:
-        mapper : debug
-elasticsearch:
-  url: localhost:9200
-
-gitlink:
-  url: https://testforgeplus.trustie.net
-  token: eyJraWQiOiJUaEVSLVl3Ukg4TWYwOHM0UnJLUDYzXzZLWmVET2NZckZXcmdzN2VUVWdrIiwiYWxnIjoiSFM1MTIifQ.eyJpc3MiOiJHaXRMaW5rIiwiaWF0IjoxNjc1NzYyMDkwLCJqdGkiOiI0MzA1ZDUwZC01ZGRkLTQ0MzUtODMyNS1iZDczYmVhMWMxYjciLCJ1c2VyIjp7ImlkIjpudWxsLCJsb2dpbiI6bnVsbCwibWFpbCI6bnVsbH19.hpHCJeU4Jyz-DM2NBUdB-tQW_E0-tu9H3LoGhsJ7kPHkSsdXJCII0jxhyPb9gwDsgd8SnlRZF8tZDDjnZSoztQ
-

src/main/resources/application-prod.yml

@@ -2,16 +2,13 @@ server:
   port: 8081
 es-url:
   127.0.0.1:9200
-
 spring:
-
-  config:
-    activate:
-      on-profile: prod
-
   application:
     # 应用名称
     name: softbot
+  config:
+    activate:
+      on-profile: prod
   cloud:
     nacos:
       discovery:
@@ -19,11 +16,19 @@ spring:
         server-addr: ${nacos_ip}:${nacos_port}
         username: ${nacos_username}
         password: ${nacos_password}
-
+      config:
+        # 配置中心地址
+        server-addr: ${nacos_ip}:${nacos_port}
+        username: ${nacos_username}
+        password: ${nacos_password}
+        # 配置文件格式
+        file-extension: yml
+        import-check:
+          enabled: false
   datasource:
-    username: ${mysql_username}
-    password: ${mysql_password}
-    url: jdbc:mysql://${mysql_ip}:${mysql_port}/${mysql_database}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+    username: root
+    password: gitlinK#%01
+    url: jdbc:mysql://mysql-public.data.svc:3306/junkenewweb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
     driver-class-name: com.mysql.cj.jdbc.Driver
     dbcp2:
       test-on-borrow: false
@@ -33,7 +38,15 @@ spring:
   elasticsearch:
     rest:
       uris: http://127.0.0.1:9200
+  devtools:
+    restart:
 
+      enabled: true
+
+      additional-paths: src/main/java
+
+      poll-interval: 3000
+      quiet-period: 1000
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
@@ -54,6 +67,7 @@ spring:
     timeout: 10000
     password: 123456
 
+
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
@@ -76,6 +90,5 @@ elasticsearch:
   url: localhost:9200
 
 gitlink:
-  url: https://testforgeplus.trustie.net
+  url: http://forgeplus.forgeplus.svc:4000
   token: eyJraWQiOiJUaEVSLVl3Ukg4TWYwOHM0UnJLUDYzXzZLWmVET2NZckZXcmdzN2VUVWdrIiwiYWxnIjoiSFM1MTIifQ.eyJpc3MiOiJHaXRMaW5rIiwiaWF0IjoxNjc1NzYyMDkwLCJqdGkiOiI0MzA1ZDUwZC01ZGRkLTQ0MzUtODMyNS1iZDczYmVhMWMxYjciLCJ1c2VyIjp7ImlkIjpudWxsLCJsb2dpbiI6bnVsbCwibWFpbCI6bnVsbH19.hpHCJeU4Jyz-DM2NBUdB-tQW_E0-tu9H3LoGhsJ7kPHkSsdXJCII0jxhyPb9gwDsgd8SnlRZF8tZDDjnZSoztQ
-

src/main/resources/application.yml

@@ -1,10 +1,88 @@
 server:
   port: 8081
-
+es-url:
+  127.0.0.1:9200
 spring:
   application:
     # 应用名称
     name: softbot
-  profiles:
-    # 环境配置
-    active: dev
+  config:
+    activate:
+      on-profile: default
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+        username: nacos
+        password: nacos
+
+  datasource:
+    username: root
+    password: 123456 #tonglin0711
+    url: jdbc:mysql://localhost:3306/testforgeplus?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    dbcp2:
+      test-on-borrow: false
+      test-while-idle: true
+      time-between-eviction-runs-millis: 3600000
+
+  elasticsearch:
+    rest:
+      uris: http://127.0.0.1:9200
+  devtools:
+    restart:
+
+      enabled: true
+
+      additional-paths: src/main/java
+
+      poll-interval: 3000
+      quiet-period: 1000
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  mvc:
+    view:
+      prefix: /WEB-INF/jsp/
+      suffix: .jsp
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    encoding: UTF-8
+  redis:
+    database: 0
+    host: 101.35.140.79
+    port: 6379
+    # password:
+    # 连接超时时间
+    timeout: 10000
+    password: 123456
+
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath:mapper/*.xml
+
+
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  type-aliases-package: com.gitlink.softbot.entity
+  configuration:
+    map-underscore-to-camel-case: true
+
+#showSql
+logging:
+  level:
+    com:
+      example:
+        mapper : debug
+elasticsearch:
+  url: localhost:9200
+
+gitlink:
+  url: https://testforgeplus.trustie.net
+  token: eyJraWQiOiJUaEVSLVl3Ukg4TWYwOHM0UnJLUDYzXzZLWmVET2NZckZXcmdzN2VUVWdrIiwiYWxnIjoiSFM1MTIifQ.eyJpc3MiOiJHaXRMaW5rIiwiaWF0IjoxNjc1NzYyMDkwLCJqdGkiOiI0MzA1ZDUwZC01ZGRkLTQ0MzUtODMyNS1iZDczYmVhMWMxYjciLCJ1c2VyIjp7ImlkIjpudWxsLCJsb2dpbiI6bnVsbCwibWFpbCI6bnVsbH19.hpHCJeU4Jyz-DM2NBUdB-tQW_E0-tu9H3LoGhsJ7kPHkSsdXJCII0jxhyPb9gwDsgd8SnlRZF8tZDDjnZSoztQ
+
+