assistant mutiple environment support

huanggang
1 parent 39319fa3
Showing 7 changed files with 25 additions and 13 deletions
assistant-boot/src/main/resources/application-dev.properties
assistant-boot/src/main/resources/application-prod.properties
assistant-boot/src/main/resources/application-test.properties
assistant-boot/src/main/resources/bootstrap.properties
assistant-dfs/src/main/java/com/diligrp/assistant/dfs/DfsConfiguration.java
assistant-dfs/src/main/java/com/diligrp/assistant/dfs/controller/FileRepositoryController.java
scripts/assistant-data.sql
@@ -36,8 +36,8 @@ spring.servlet.multipart.file-size-threshold=20MB
 dfs.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
 dfs.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
 dfs.oss.uri=https://oss-cn-hangzhou.aliyuncs.com
-dfs.oss.access-key-id=LTAI5tS2xUrriUfti9pvDTwM
-dfs.oss.access-key-secret=NIa9FQMDc5zSAtvfOeOK4J1dp7aotg
+dfs.oss.access-key-id=LTAI5tRiMbdaVfND45TBFatu
+dfs.oss.access-key-secret=zP2P1i0MLiOBDKO6naQZRy4Ls70cEf
 #Sms configuration
 sms.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
@@ -35,9 +35,9 @@ spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.file-size-threshold=20MB
 dfs.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
 dfs.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
-dfs.oss.uri=https://oss-cn-hangzhou.aliyuncs.com
-dfs.oss.access-key-id=LTAI5tS2xUrriUfti9pvDTwM
-dfs.oss.access-key-secret=NIa9FQMDc5zSAtvfOeOK4J1dp7aotg
+dfs.oss.uri=https://oss-cn-beijing-internal.aliyuncs.com
+dfs.oss.access-key-id=LTAI5tRiMbdaVfND45TBFatu
+dfs.oss.access-key-secret=zP2P1i0MLiOBDKO6naQZRy4Ls70cEf
 #Sms configuration
 sms.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
@@ -36,8 +36,8 @@ spring.servlet.multipart.file-size-threshold=20MB
 dfs.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
 dfs.public-key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0bQQa0F+XYtY0D21Ifi7uaTMK4Ovx/f11+6gVO3bBgP8soEAB+wGG/36R0NRkA6JVNy1YGLdyBON0GnC6NPTMCAwEAAQ==
 dfs.oss.uri=https://oss-cn-hangzhou.aliyuncs.com
-dfs.oss.access-key-id=LTAI5tS2xUrriUfti9pvDTwM
-dfs.oss.access-key-secret=NIa9FQMDc5zSAtvfOeOK4J1dp7aotg
+dfs.oss.access-key-id=LTAI5tRiMbdaVfND45TBFatu
+dfs.oss.access-key-secret=zP2P1i0MLiOBDKO6naQZRy4Ls70cEf
 #Sms configuration
 sms.private-key=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAvRtBBrQX5di1jQPbUh+Lu5pMwrg6/H9/XX7qBU7dsGA/yygQAH7AYb/fpHQ1GQDolU3LVgYt3IE43QacLo09MwIDAQABAkAJ8U5kb8e0U2J+CmIJedRZO0GtX+MeD1uX51iCNJqYvbI/tKAgqd9ulc07it7tW0vGhDDj+WaVLp1R5D7bgRcpAiEA6Vc1xjoMYmT+OL+DZfipOeMTUwEePCg0Eq8DnVtalgsCIQDPeGSQ+lVijjNTEF7swM6rH5Ofa1E+ry5VRAw1ywI2eQIgdNFuYIErNg9tnqdydxiYUBy4zfNfWaqe90ObQao8naUCIQComhNIClgXZq5pA3XQ+wM458llFaaJxX1mx40QrjDXKQIgB+x7Fz2MT/GdIUhN6s1Rpfb5IIAR51ztiVEJlJ+wpdo=
-server.port=8080
+server.port=8680
 server.servlet.context-path=/
 server.servlet.encoding.charset=UTF-8
 server.servlet.encoding.force=true
-spring.profiles.active=dev
-spring.application.name=uap-service
 \ No newline at end of file
+spring.profiles.active=prod
+spring.application.name=assistant-service
 \ No newline at end of file
@@ -28,7 +28,7 @@ public class DfsConfiguration {
         DfsProperties.Oss oss = properties.getOss();
         if (oss != null) {
             // 可利用数据库进行通道配置, 前期并没有必要
-            DfsPipeline pipeline = new OssPipeline(1, "OSS文件存储服务", oss.getUri(),
+            DfsPipeline pipeline = new OssPipeline(10, "OSS文件存储服务", oss.getUri(),
                 oss.getAccessKeyId(), oss.getAccessKeySecret());
             pipelineManager.registerPipeline(pipeline);
         }
@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDateTime;
+
 @RestController
 @RequestMapping(value = "/dfs")
 public class FileRepositoryController {
@@ -34,7 +36,8 @@ public class FileRepositoryController {
         DfsAccessToken accessToken = new DfsAccessToken(request.getPipeline(), RandomUtils.randomUUID(false));
         FileRepository repository = FileRepository.builder().repositoryId(accessToken.getRepositoryId())
-            .name(request.getName()).pipeline(request.getPipeline()).description(request.getDescription()).build();
+            .name(request.getName()).pipeline(request.getPipeline()).description(request.getDescription())
+            .createdTime(LocalDateTime.now()).build();
         fileRepositoryService.createFileRepository(accessToken, repository);
         return Message.success(accessToken.toString(dfsProperties.getPrivateKey()));
     }
+USE dili_assistant;
+-- 短信模板ID
 INSERT INTO uid_sequence_key (`key`, `name`, `value`, `step`, `pattern`, `expired_on`, `version`)
-VALUES ('SMS_TEMPLATE_KEY', 'SMS消息模版ID', 1, 1, 'SMS%d{yyyyMMdd}%n{4}', '2024-06-05', 0)
 \ No newline at end of file
+VALUES ('SMS_TEMPLATE_KEY', 'SMS消息模版ID', 1, 1, 'SMS%d{yyyyMMdd}%n{4}', '2024-06-05', 0)
+
+INSERT INTO `sms_template`(`template_id`, `pipeline`, `type`, `name`, `content`, `state`, `description`, `out_template_id`, `created_time`, `modified_time`)
+VALUES ('SMS202408080001', 20, 0, '商户注册短信模板', '验证码：${code}，电子结算商户版注册验证码10分钟内有效。如非本人操作，请忽略本短信。', 2, '电子结算商户版注册验证码短信模板', NULL, '2024-08-08 17:31:55', '2024-08-08 17:55:29');
+
+-- DFS文件服务
+INSERT INTO `dfs_file_repository`(`repository_id`, `name`, `pipeline`, `description`, `created_time`) VALUES ('29ad2204ca8248daa5b09be73dc26926', '商户版电子结算存储空间', 10, '存储商户版电子结算所有使用的图片-非生产环境', '2024-08-20 10:43:05');
+INSERT INTO `dfs_file_repository`(`repository_id`, `name`, `pipeline`, `description`, `created_time`) VALUES ('fa6f828deae94f45a615b73790116699', '商户版电子结算存储空间', 10, '存储商户版电子结算所有使用的图片-生产环境', '2024-08-20 10:43:05');