删除多余的配置

2caa00b4 · tangtuo · 8a3342bc · 2caa00b4 · 2caa00b4 · 2caa00b4
Commit 2caa00b4 authored Jan 04, 2022 by tangtuo
12 changed files
--- a/joying-admin/src/main/resources/application-dev.yml
+++ b/joying-admin/src/main/resources/application-dev.yml
@@ -82,13 +82,6 @@ chain:
    contract-name: user.evm.0xd996a3a866c577596df260844a045a068ec5accd8d71ccaa3d578c9617ec5490
    contract-address: 1iDWTHZQxPES4hLveZRcwJH6AMaMfZfZZ

-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2

 copyright:
  apply-url: https://p.yareiot.com/ccct/api/copyright/create

--- a/joying-admin/src/main/resources/application-local.yml
+++ b/joying-admin/src/main/resources/application-local.yml
@@ -74,22 +74,15 @@ swagger:

 chain:
  para:
-    rpc-url: http://172.16.101.133:8801
-    withhold-addr: 1Ae6FfgdYJn6LLaqDoRjwga3j4TTmMq3t7
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    title: user.p.joying.
-    admin: 16naUoLwjNUgMhGVRmL3xTVpCso2DJp8JZ
-    admin-key: 8cd19e9bf39055f95e3e33cc1e08b9f9fc2e9be48a5b3a4d401e64041c97aec7
-    contract-name: user.evm.0xd996a3a866c577596df260844a045a068ec5accd8d71ccaa3d578c9617ec5490
-    contract-address: 1iDWTHZQxPES4hLveZRcwJH6AMaMfZfZZ
+    rpcUrl: http://146.56.197.42:12021
+    tokenManager: 133AfuMYQXRxc45JGUb1jLk1M1W4ka39L1
+    tokenManagerKey: 85c6c95bcb41779f1d197e686d26b228a523fa36b77cfed79edb59b8853b569b
+    withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
+    withholdKey: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
+    title: user.p.mall.
+    cName: user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
+    cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW

-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2

 copyright:
  apply-url: https://p.yareiot.com/ccct/api/copyright/create

--- a/joying-admin/src/main/resources/application-nj.yml
+++ b/joying-admin/src/main/resources/application-nj.yml
@@ -84,14 +84,6 @@ chain:
    cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW


-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2
-
 copyright:
  apply-url: https://p.yareiot.com/ccct/api/copyright/create
  query-url: https://p.yareiot.com/ccct/api/copyright/query

--- a/joying-admin/src/main/resources/application-prod.yml
+++ b/joying-admin/src/main/resources/application-prod.yml
@@ -82,13 +82,6 @@ chain:
    contract-name: user.evm.0x1adc08f04fbc0cda9fb45a6b36b317d4fed9715f68314b754ce1e22ea681cd28
    contract-address: 1JoYQKtT6PwtfZWqTFPPdAksQ7jB2JRAPw

-aliyun:
-  oss:
-    app-key: LTAI5tAAXBCtnQ2ytwagazjt
-    app-secret: x0T6hyJvRFLtPjZYrNo5egEc4kShlU
-    end-point: oss-cn-shanghai.aliyuncs.com
-    simple-bucket: joying-file
-    encrypt-bucket: joying-nft

 copyright:
  app-id: 289391457858

--- a/joying-admin/src/main/resources/application-test.yml
+++ b/joying-admin/src/main/resources/application-test.yml
-server:
-  port: 8002
-spring:
-  main:
-    allow-bean-definition-overriding: true
-  datasource:
-    url: jdbc:mysql://172.16.101.135:3306/joying_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
-    username: root
-    password: Joying@123456
-    platform: mysql
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      initial-size: 5
-      min-idle: 5
-      max-active: 20
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: false
-      max-pool-prepared-statement-per-connection-size: 20
-      filters: stat ,wall
-      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      useGlobalDataSourceStat: true
-  redis:
-    host: 172.16.101.136
-    port: 6379
-    password: 123456
-    lettuce:
-      pool:
-        # 连接池最大连接数（使用负值表示没有限制） 默认 8
-        max-active: 100
-        # 连接池最大阻塞等待时间（使用负值表示没有限制） 默认 -1
-        max-wait: -1
-        # 连接池中的最大空闲连接 默认 8
-        max-idle: 8
-        # 连接池中的最小空闲连接 默认 0
-        min-idle: 0
-  cache:
-    # 整合SpringCache,redis作为缓存类型
-    type: redis
-    redis:
-      # 缓存失效时间
-      time-to-live: 86400000
-  rabbitmq:
-    host: 10.0.0.81
-    port: 5672
-    username: admin
-    password: admin
-    listener:
-      simple:
-        acknowledge-mode: manual #acknowledge-mode: none，关闭ack；manual，手动ack；auto：自动ack
-swagger:
-  title: 乐映影视乐映影视后台管理系统
-  description: 乐映影视后台管理系统RESTFUL API
-  version: 1.0.0
-  base-package: com.fzm.admin.controller
-  base-path: /**
-  enabled: true
-  globalOperationParameters:
-    - description: Authorization
-      modelRef: string
-      name: Authorization
-      parameterType: header
-      required: false
-  contact:
-    name: tangtuo
-    email: ttuo@33.com
-
-chain:
-  para:
-    rpc-url: http://172.16.101.133:8801
-    withhold-addr: 1Ae6FfgdYJn6LLaqDoRjwga3j4TTmMq3t7
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    title: user.p.joying.
-    admin: 16naUoLwjNUgMhGVRmL3xTVpCso2DJp8JZ
-    admin-key: 8cd19e9bf39055f95e3e33cc1e08b9f9fc2e9be48a5b3a4d401e64041c97aec7
-    contract-name: user.evm.0xd996a3a866c577596df260844a045a068ec5accd8d71ccaa3d578c9617ec5490
-    contract-address: 1iDWTHZQxPES4hLveZRcwJH6AMaMfZfZZ
-
-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2
-
-copyright:
-  url: https://p.yareiot.com/ccct/api/copyright/create
-  app-id: 289391457858
-  app-secret: xExjKUCYH1nrze6Hpxf8s1dYWdxEggo2FiwKlZKygCItOV7E8bFhkyr4C192uhK
-
-huaweiyun:
-  obs:
-    app-key: HIULSHJZJOTWB72Z38ZB
-    app-secret: GI0oWEGRJuMKmPXJq2fCmuMpFPIITLmjeCQxo2tA
-    end-point: obs.cn-east-3.myhuaweicloud.com
-    bucket: filmchain-file
\ No newline at end of file
--- a/joying-admin/src/main/resources/logback-spring.xml
+++ b/joying-admin/src/main/resources/logback-spring.xml
@@ -54,10 +54,6 @@
            <appender-ref ref="CONSOLE"/>
            <appender-ref ref="INFO_FILE"/>
        </springProfile>
-        <springProfile name="test">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="INFO_FILE"/>
-        </springProfile>
        <springProfile name="prod">
            <appender-ref ref="CONSOLE"/>
            <appender-ref ref="INFO_FILE"/>

--- a/joying-portal/src/main/resources/application-dev.yml
+++ b/joying-portal/src/main/resources/application-dev.yml
@@ -77,22 +77,16 @@ sms:

 chain:
  para:
-    rpc-url: http://172.16.101.133:8801
-    withhold-addr: 1Ae6FfgdYJn6LLaqDoRjwga3j4TTmMq3t7
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    title: user.p.joying.
-    admin: 16naUoLwjNUgMhGVRmL3xTVpCso2DJp8JZ
-    admin-key: 8cd19e9bf39055f95e3e33cc1e08b9f9fc2e9be48a5b3a4d401e64041c97aec7
-    contract-name: user.evm.0x72ab91df57d70ddca74c219fee29a4e08632bb7b1109c1627fc11173961b180c
-    contract-address: 1ErrPnk5mocNL5k87Yx66ihqmprc8avjPJ
+    rpcUrl: http://146.56.197.42:12021
+    tokenManager: 133AfuMYQXRxc45JGUb1jLk1M1W4ka39L1
+    tokenManagerKey: 85c6c95bcb41779f1d197e686d26b228a523fa36b77cfed79edb59b8853b569b
+    withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
+    withholdKey: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
+    title: user.p.mall.
+    cName: user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
+    cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
+

-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2
 huaweiyun:
  obs:
    app-key: HIULSHJZJOTWB72Z38ZB

--- a/joying-portal/src/main/resources/application-local.yml
+++ b/joying-portal/src/main/resources/application-local.yml
@@ -89,22 +89,15 @@ sms:

 chain:
  para:
-    rpc-url: http://172.16.101.133:8801
-    withhold-addr: 1Ae6FfgdYJn6LLaqDoRjwga3j4TTmMq3t7
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    title: user.p.joying.
-    admin: 16naUoLwjNUgMhGVRmL3xTVpCso2DJp8JZ
-    admin-key: 8cd19e9bf39055f95e3e33cc1e08b9f9fc2e9be48a5b3a4d401e64041c97aec7
-    contract-name: user.evm.0x72ab91df57d70ddca74c219fee29a4e08632bb7b1109c1627fc11173961b180c
-    contract-address: 1ErrPnk5mocNL5k87Yx66ihqmprc8avjPJ
+    rpcUrl: http://146.56.197.42:12021
+    tokenManager: 133AfuMYQXRxc45JGUb1jLk1M1W4ka39L1
+    tokenManagerKey: 85c6c95bcb41779f1d197e686d26b228a523fa36b77cfed79edb59b8853b569b
+    withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
+    withholdKey: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
+    title: user.p.mall.
+    cName: user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
+    cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW

-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2

 huaweiyun:
  obs:

--- a/joying-portal/src/main/resources/application-nj.yml
+++ b/joying-portal/src/main/resources/application-nj.yml
@@ -100,14 +100,6 @@ chain:



-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2
-
 huaweiyun:
  obs:
    app-key: HIULSHJZJOTWB72Z38ZB

--- a/joying-portal/src/main/resources/application-prod.yml
+++ b/joying-portal/src/main/resources/application-prod.yml
@@ -86,13 +86,6 @@ chain:
    contract-name: user.evm.0x1adc08f04fbc0cda9fb45a6b36b317d4fed9715f68314b754ce1e22ea681cd28
    contract-address: 1JoYQKtT6PwtfZWqTFPPdAksQ7jB2JRAPw

-aliyun:
-  oss:
-    app-key: LTAI5tKnkYvSprbF26n7FZN3
-    app-secret: kxJfWPa03WSTBsRvj7n2bYeBsdWBgY
-    end-point: oss-cn-shanghai.aliyuncs.com
-    simple-bucket: joying-file
-    encrypt-bucket: joying-nft

 huaweiyun:
  obs:

--- a/joying-portal/src/main/resources/application-test.yml
+++ b/joying-portal/src/main/resources/application-test.yml
-server:
-  port: 8001
-spring:
-  main:
-    allow-bean-definition-overriding: true
-  datasource:
-    url: jdbc:mysql://172.16.101.135:3306/joying_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
-    username: root
-    password: Joying@123456
-    platform: mysql
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      initial-size: 5
-      min-idle: 5
-      max-active: 20
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: false
-      max-pool-prepared-statement-per-connection-size: 20
-      filters: stat ,wall
-      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      useGlobalDataSourceStat: true
-  redis:
-    host: 172.16.101.136
-    port: 6379
-    password: 123456
-    lettuce:
-      pool:
-        # 连接池最大连接数（使用负值表示没有限制） 默认 8
-        max-active: 100
-        # 连接池最大阻塞等待时间（使用负值表示没有限制） 默认 -1
-        max-wait: -1
-        # 连接池中的最大空闲连接 默认 8
-        max-idle: 8
-        # 连接池中的最小空闲连接 默认 0
-        min-idle: 0
-  cache:
-    # 整合SpringCache,redis作为缓存类型
-    type: redis
-    redis:
-      time-to-live: 86400000
-#  rabbitmq:
-#    host: 172.16.101.135
-#    port: 5672
-#    username: admin
-#    password: admin
-#    listener:
-#      simple:
-#        ####开启手动签收
-#        acknowledge-mode: manual
-
-swagger:
-  title: 乐映影视门户系统
-  description: 乐映影视门户系统RESTFUL API
-  version: 1.0.0
-  base-package: com.fzm.portal.controller
-  base-path: /**
-  enabled: true
-  globalOperationParameters:
-    - description: Authorization
-      modelRef: string
-      name: Authorization
-      parameterType: header
-      required: false
-  contact:
-    name: tangtuo
-    email: ttuo@33.com
-
-sms:
-  app-key: Yiru
-  app-secret: mx5oaR^RY8!(ziHn
-  login-message-codetype: quick
-  login-email-codetype: quick
-  login-voice-codetype: quick
-  send-sms-url: http://118.31.52.32/send/sms2
-  validate-code-url: http://118.31.52.32/validate/code
-  transfer-nft-message-codetype: notice_transfer
-  transfer-nft-email-codetype: notice_transfer
-  transfer-nft-voice-codetype: notice_transfer
-
-chain:
-  para:
-    rpc-url: http://172.16.101.133:8801
-    withhold-addr: 1Ae6FfgdYJn6LLaqDoRjwga3j4TTmMq3t7
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    title: user.p.joying.
-    admin: 16naUoLwjNUgMhGVRmL3xTVpCso2DJp8JZ
-    admin-key: 8cd19e9bf39055f95e3e33cc1e08b9f9fc2e9be48a5b3a4d401e64041c97aec7
-    contract-name: user.evm.0x72ab91df57d70ddca74c219fee29a4e08632bb7b1109c1627fc11173961b180c
-    contract-address: 1ErrPnk5mocNL5k87Yx66ihqmprc8avjPJ
-
-aliyun:
-  oss:
-    app-key: LTAI5tHGn7cVJdEtihTFLSeB
-    app-secret: XYmfBSbLaZoblGXZwIXkbhfBD7a1eg
-    end-point: oss-cn-hangzhou.aliyuncs.com
-    simple-bucket: test-nft
-    encrypt-bucket: test-nft-2
-
-huaweiyun:
-  obs:
-    app-key: HIULSHJZJOTWB72Z38ZB
-    app-secret: GI0oWEGRJuMKmPXJq2fCmuMpFPIITLmjeCQxo2tA
-    end-point: obs.cn-east-3.myhuaweicloud.com
-    bucket: filmchain-file
\ No newline at end of file
--- a/joying-portal/src/main/resources/logback-spring.xml
+++ b/joying-portal/src/main/resources/logback-spring.xml
@@ -54,10 +54,6 @@
            <appender-ref ref="CONSOLE"/>
            <appender-ref ref="INFO_FILE"/>
        </springProfile>
-        <springProfile name="test">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="INFO_FILE"/>
-        </springProfile>
        <springProfile name="prod">
            <appender-ref ref="CONSOLE"/>
            <appender-ref ref="INFO_FILE"/>