lyhzzz vor 1 Jahr
Ursprung
Commit
237761978c

+ 25 - 0
pom.xml

@@ -33,6 +33,25 @@
             <groupId>com.fdkankan</groupId>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
             <version>3.0.0-SNAPSHOT</version>
             <version>3.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacv</artifactId>
+                </exclusion>
+
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacpp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacv-platform</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>joinery</groupId>
+                    <artifactId>jave</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         </dependency>
 
 
 
 
@@ -56,6 +75,12 @@
 
 
         <dependency>
         <dependency>
             <groupId>com.fdkankan</groupId>
             <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-obs</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
             <artifactId>4dkankan-utils-redis</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
         </dependency>

+ 0 - 26
src/main/resources/bootstrap-eurtest.yml

@@ -1,26 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-takelook
-  cloud:
-    nacos:
-      config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4-test-eur
-        extension-configs:
-          - data-id: 4dkankan-center-takelook.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}

+ 0 - 54
src/main/resources/bootstrap-local.yml

@@ -1,54 +0,0 @@
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource          # 数据源类型:HikariCP
-    driver-class-name: com.mysql.jdbc.Driver          # mysql驱动
-    url: jdbc:mysql://120.24.144.164:3306/4dkankan_takelook?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: 4Dage@4Dage#@168
-    hikari:
-      connection-timeout: 30000         # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没可用的连接则发生SQLException, 默认:30秒
-      minimum-idle: 5                   # 最小连接数
-      maximum-pool-size: 20             # 最大连接数
-      auto-commit: true                 # 事务自动提交
-      idle-timeout: 600000              # 连接超时的最大时长(毫秒),超时则被释放(retired),默认:10分钟
-      pool-name: DateSourceHikariCP     # 连接池名字
-      max-lifetime: 1800000             # 连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟 1800000ms
-      connection-test-query: SELECT 1   # 连接测试语句
-  redis:
-    host: 120.25.146.52
-    port: 6379
-    timeout: 6000ms
-    password:
-    jedis:
-      pool:
-        max-active: 10  #连接池最大连接数(使用负值表示没有限制)
-        max-idle: 10 # 连接池中的最大空闲连接
-        min-idle: 5 # 连接池中的最小空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
-    lettuce:
-      shutdown-timeout: 0ms
-
-4dkk:
-  fdService:
-    #官网生产环境:https://www.4dkankan.com      http://test.4dkankan.com
-   # basePath: http://test.4dkankan.com
-    #port: 80
-    basePath: http://test.4dkankan.com
-    port: 80
-
-wx:
-  #要打开的小程序版本。正式版为 release,体验版为 trial,开发版为 develop
-  env_version: trial
-  path: pages/sync/room/room
-
-
-upload:
-  type: oss
-  query-path: https://4dkk.4dage.com/
-oss:
-  #point: http://oss-cn-shenzhen-internal.aliyuncs.com
-  point: http://oss-cn-shenzhen-internal.aliyuncs.com
-  key: LTAIUrvuHqj8pvry
-  secrey: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-  bucket: 4dkankan
-  small: ?x-oss-process=image/resize,m_fill,h_%s,w_%s

+ 0 - 26
src/main/resources/bootstrap-prod-eur.yml

@@ -1,26 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-takelook
-  cloud:
-    nacos:
-      config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4-prod-eur
-        extension-configs:
-          - data-id: 4dkankan-center-takelook.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}

+ 0 - 27
src/main/resources/bootstrap-prod.yml

@@ -1,27 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-takelook
-  cloud:
-    nacos:
-      config:
-        server-addr: 172.20.1.63:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4-prod
-        extension-configs:
-          - data-id: 4dkankan-center-takelook.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}

+ 0 - 26
src/main/resources/bootstrap-test.yml

@@ -1,26 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-takelook
-  cloud:
-      nacos:
-        config:
-          server-addr: 120.24.144.164:8848
-          file-extension: yaml
-          namespace: 4dkankan-v4-test
-          extension-configs:
-            - data-id: 4dkankan-center-takelook.yaml
-              group: DEFAULT_GROUP
-              refresh: true
-          shared-configs:
-            - data-id: common-redis-config.yaml
-              group: DEFAULT_GROUP
-              refresh: true
-            - data-id: forest-config.yaml
-              group: DEFAULT_GROUP
-              refresh: true
-            - data-id: common-fyun-config.yaml
-              group: DEFAULT_GROUP
-              refresh: true
-        discovery:
-          server-addr: ${spring.cloud.nacos.config.server-addr}
-          namespace: ${spring.cloud.nacos.config.namespace}

+ 1 - 1
src/main/resources/bootstrap-xj.yml

@@ -4,7 +4,7 @@ spring:
   cloud:
   cloud:
     nacos:
     nacos:
       username: nacos
       username: nacos
-      password: Nacos4Dage.
+      password: Nacos123ROOT.
       config:
       config:
         server-addr: 127.0.0.1:8848
         server-addr: 127.0.0.1:8848
         file-extension: yaml
         file-extension: yaml