erp / dili-assistant · Commits

Commit 39319fa323cfcecec613a96a73273b158d6a9f55

Authored by huanggang
1 parent 150ccda6
build: skipped

remove nacos dependence

Inline Side-by-side
Showing 6 changed files with 143 additions and 62 deletions
assistant-boot/build.gradle
  View file @39319fa
... ... @@ -14,6 +14,4 @@ dependencies {
14 14 implementation project(':assistant-product')
15 15 implementation project(':assistant-logging')
16 16 implementation project(':assistant-uid')
17   - implementation 'com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2022.0.0.0-RC2'
18   - implementation 'com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2022.0.0.0-RC2'
19 17 }
20 18 \ No newline at end of file
... ...
assistant-boot/src/main/resources/application-dev.properties 0 → 100644
  View file @39319fa
  1 +#Datasource configuration
  2 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
  3 +spring.datasource.url=jdbc:mysql://mysql.diligrp.com:3306/dili_assistant?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
  4 +spring.datasource.username=root
  5 +spring.datasource.password=123456
  6 +spring.datasource.type=com.zaxxer.hikari.HikariDataSource
  7 +spring.datasource.hikari.pool-name=AssistantHikariPool
  8 +spring.datasource.hikari.minimum-idle=4
  9 +spring.datasource.hikari.maximum-pool-size=60
  10 +spring.datasource.hikari.idle-timeout=120000
  11 +spring.datasource.hikari.max-lifetime=900000
  12 +spring.datasource.hikari.connection-timeout=15000
  13 +spring.datasource.hikari.connection-test-query=SELECT 1
  14 +
  15 +#Redis configuration
  16 +spring.data.redis.host=redis.diligrp.com
  17 +spring.data.redis.port=6379
  18 +spring.data.redis.database=8
  19 +#spring.data.redis.username=
  20 +#spring.data.redis.password=
  21 +spring.data.redis.connect-timeout=15000
  22 +spring.data.redis.timeout=30000
  23 +#spring.data.redis.lettuce.pool.enabled=false
  24 +
  25 +#RabbitMQ configuration
  26 +spring.rabbitmq.host=rabbitmq.diligrp.com
  27 +spring.rabbitmq.port=5672
  28 +spring.rabbitmq.username=admin
  29 +spring.rabbitmq.password=123456
  30 +spring.rabbitmq.virtual-host=/
  31 +
  32 +#DFS configuration
  33 +spring.servlet.multipart.max-file-size=40MB
  34 +spring.servlet.multipart.max-request-size=100MB
  35 +spring.servlet.multipart.file-size-threshold=20MB
  36 +dfs.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
  37 +dfs.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
  38 +dfs.oss.uri=https://oss-cn-hangzhou.aliyuncs.com
  39 +dfs.oss.access-key-id=LTAI5tS2xUrriUfti9pvDTwM
  40 +dfs.oss.access-key-secret=NIa9FQMDc5zSAtvfOeOK4J1dp7aotg
  41 +
  42 +#Sms configuration
  43 +sms.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
  44 +sms.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
  45 +sms.smschinese.uri=http://utf8.api.smschinese.cn
  46 +sms.smschinese.uid=zhuxuegang@diligrp.com
  47 +sms.smschinese.secret-key=c0978121c3893cf9ddbc
0 48 \ No newline at end of file
... ...
assistant-boot/src/main/resources/application-prod.properties 0 → 100644
  View file @39319fa
  1 +#Datasource configuration
  2 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
  3 +spring.datasource.url=jdbc:mysql://mysql.diligrp.com:3306/dili_assistant?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
  4 +spring.datasource.username=root
  5 +spring.datasource.password=123456
  6 +spring.datasource.type=com.zaxxer.hikari.HikariDataSource
  7 +spring.datasource.hikari.pool-name=AssistantHikariPool
  8 +spring.datasource.hikari.minimum-idle=4
  9 +spring.datasource.hikari.maximum-pool-size=60
  10 +spring.datasource.hikari.idle-timeout=120000
  11 +spring.datasource.hikari.max-lifetime=900000
  12 +spring.datasource.hikari.connection-timeout=15000
  13 +spring.datasource.hikari.connection-test-query=SELECT 1
  14 +
  15 +#Redis configuration
  16 +spring.data.redis.host=redis.diligrp.com
  17 +spring.data.redis.port=6379
  18 +spring.data.redis.database=8
  19 +#spring.data.redis.username=
  20 +#spring.data.redis.password=
  21 +spring.data.redis.connect-timeout=15000
  22 +spring.data.redis.timeout=30000
  23 +#spring.data.redis.lettuce.pool.enabled=false
  24 +
  25 +#RabbitMQ configuration
  26 +spring.rabbitmq.host=rabbitmq.diligrp.com
  27 +spring.rabbitmq.port=5672
  28 +spring.rabbitmq.username=admin
  29 +spring.rabbitmq.password=123456
  30 +spring.rabbitmq.virtual-host=/
  31 +
  32 +#DFS configuration
  33 +spring.servlet.multipart.max-file-size=40MB
  34 +spring.servlet.multipart.max-request-size=100MB
  35 +spring.servlet.multipart.file-size-threshold=20MB
  36 +dfs.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
  37 +dfs.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
  38 +dfs.oss.uri=https://oss-cn-hangzhou.aliyuncs.com
  39 +dfs.oss.access-key-id=LTAI5tS2xUrriUfti9pvDTwM
  40 +dfs.oss.access-key-secret=NIa9FQMDc5zSAtvfOeOK4J1dp7aotg
  41 +
  42 +#Sms configuration
  43 +sms.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
  44 +sms.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
  45 +sms.smschinese.uri=http://utf8.api.smschinese.cn
  46 +sms.smschinese.uid=zhuxuegang@diligrp.com
  47 +sms.smschinese.secret-key=c0978121c3893cf9ddbc
0 48 \ No newline at end of file
... ...
assistant-boot/src/main/resources/application-test.properties 0 → 100644
  View file @39319fa
  1 +#Datasource configuration
  2 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
  3 +spring.datasource.url=jdbc:mysql://mysql.diligrp.com:3306/dili_assistant?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
  4 +spring.datasource.username=root
  5 +spring.datasource.password=123456
  6 +spring.datasource.type=com.zaxxer.hikari.HikariDataSource
  7 +spring.datasource.hikari.pool-name=AssistantHikariPool
  8 +spring.datasource.hikari.minimum-idle=4
  9 +spring.datasource.hikari.maximum-pool-size=60
  10 +spring.datasource.hikari.idle-timeout=120000
  11 +spring.datasource.hikari.max-lifetime=900000
  12 +spring.datasource.hikari.connection-timeout=15000
  13 +spring.datasource.hikari.connection-test-query=SELECT 1
  14 +
  15 +#Redis configuration
  16 +spring.data.redis.host=redis.diligrp.com
  17 +spring.data.redis.port=6379
  18 +spring.data.redis.database=8
  19 +#spring.data.redis.username=
  20 +#spring.data.redis.password=
  21 +spring.data.redis.connect-timeout=15000
  22 +spring.data.redis.timeout=30000
  23 +#spring.data.redis.lettuce.pool.enabled=false
  24 +
  25 +#RabbitMQ configuration
  26 +spring.rabbitmq.host=rabbitmq.diligrp.com
  27 +spring.rabbitmq.port=5672
  28 +spring.rabbitmq.username=admin
  29 +spring.rabbitmq.password=123456
  30 +spring.rabbitmq.virtual-host=/
  31 +
  32 +#DFS configuration
  33 +spring.servlet.multipart.max-file-size=40MB
  34 +spring.servlet.multipart.max-request-size=100MB
  35 +spring.servlet.multipart.file-size-threshold=20MB
  36 +dfs.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
  37 +dfs.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
  38 +dfs.oss.uri=https://oss-cn-hangzhou.aliyuncs.com
  39 +dfs.oss.access-key-id=LTAI5tS2xUrriUfti9pvDTwM
  40 +dfs.oss.access-key-secret=NIa9FQMDc5zSAtvfOeOK4J1dp7aotg
  41 +
  42 +#Sms configuration
  43 +sms.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
  44 +sms.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
  45 +sms.smschinese.uri=http://utf8.api.smschinese.cn
  46 +sms.smschinese.uid=zhuxuegang@diligrp.com
  47 +sms.smschinese.secret-key=c0978121c3893cf9ddbc
0 48 \ No newline at end of file
... ...
assistant-boot/src/main/resources/application.properties
  View file @39319fa
... ... @@ -8,52 +8,4 @@ mybatis.configuration.map-underscore-to-camel-case=true
8 8 mybatis.configuration.use-column-label=true
9 9 mybatis.configuration.default-statement-timeout=25000
10 10 mybatis.mapper-locations=classpath*:com/diligrp/assistant/dao/mapper/**/*.xml
11   -mybatis.configuration.default-enum-type-handler=com.diligrp.assistant.shared.mybatis.GenericEnumTypeHandler
12   -
13   -#Datasource configuration
14   -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
15   -spring.datasource.url=jdbc:mysql://mysql.diligrp.com:3306/dili_assistant?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
16   -spring.datasource.username=root
17   -spring.datasource.password=123456
18   -spring.datasource.type=com.zaxxer.hikari.HikariDataSource
19   -spring.datasource.hikari.pool-name=AssistantHikariPool
20   -spring.datasource.hikari.minimum-idle=4
21   -spring.datasource.hikari.maximum-pool-size=60
22   -spring.datasource.hikari.idle-timeout=120000
23   -spring.datasource.hikari.max-lifetime=900000
24   -spring.datasource.hikari.connection-timeout=15000
25   -spring.datasource.hikari.connection-test-query=SELECT 1
26   -
27   -#Redis configuration
28   -spring.data.redis.host=redis.diligrp.com
29   -spring.data.redis.port=6379
30   -spring.data.redis.database=8
31   -#spring.data.redis.username=
32   -#spring.data.redis.password=
33   -spring.data.redis.connect-timeout=15000
34   -spring.data.redis.timeout=30000
35   -#spring.data.redis.lettuce.pool.enabled=false
36   -
37   -#RabbitMQ configuration
38   -spring.rabbitmq.host=rabbitmq.diligrp.com
39   -spring.rabbitmq.port=5672
40   -spring.rabbitmq.username=admin
41   -spring.rabbitmq.password=123456
42   -spring.rabbitmq.virtual-host=/
43   -
44   -#DFS configuration
45   -spring.servlet.multipart.max-file-size=40MB
46   -spring.servlet.multipart.max-request-size=100MB
47   -spring.servlet.multipart.file-size-threshold=20MB
48   -dfs.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
49   -dfs.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
50   -dfs.oss.uri=https://oss-cn-hangzhou.aliyuncs.com
51   -dfs.oss.access-key-id=LTAI5tS2xUrriUfti9pvDTwM
52   -dfs.oss.access-key-secret=NIa9FQMDc5zSAtvfOeOK4J1dp7aotg
53   -
54   -#Sms configuration
55   -sms.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
56   -sms.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
57   -sms.smschinese.uri=http://utf8.api.smschinese.cn
58   -sms.smschinese.uid=zhuxuegang@diligrp.com
59   -sms.smschinese.secret-key=c0978121c3893cf9ddbc
60 11 \ No newline at end of file
  12 +mybatis.configuration.default-enum-type-handler=com.diligrp.assistant.shared.mybatis.GenericEnumTypeHandler
61 13 \ No newline at end of file
... ...
assistant-boot/src/main/resources/bootstrap.properties
  View file @39319fa
... ... @@ -4,14 +4,4 @@ server.servlet.encoding.charset=UTF-8
4 4 server.servlet.encoding.force=true
5 5  
6 6 spring.profiles.active=dev
7   -spring.application.name=uap-service
8   -
9   -spring.cloud.nacos.discovery.enabled=true
10   -spring.cloud.nacos.discovery.group=WEB_APPLICATION
11   -spring.cloud.nacos.discovery.server-addr=nacos.diligrp.com:8848
12   -spring.cloud.nacos.discovery.namespace=54c39cfe-d1c4-4022-a94b-a3486c5927fc
13   -
14   -spring.cloud.nacos.config.enabled=true
15   -spring.cloud.nacos.config.group=WEB_APPLICATION
16   -spring.cloud.nacos.config.server-addr=nacos.diligrp.com:8848
17   -spring.cloud.nacos.config.namespace=54c39cfe-d1c4-4022-a94b-a3486c5927fc
18 7 \ No newline at end of file
  8 +spring.application.name=uap-service
19 9 \ No newline at end of file
... ...