代码优化 (#212)

* 阿里云通知被叫号码支持空值

* 修改订阅状态显示文案

* docker启动配置文件更新

docker/run-all/docker-compose.yml

@@ -48,7 +48,7 @@ services:
       POSTGRES_DB: jetlinks
       TZ: Asia/Shanghai
   ui:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-antd:1.13.0
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-pro:2.0.0
     container_name: jetlinks-ce-ui
     ports:
       - 9000:80
@@ -59,12 +59,13 @@ services:
     links:
       - jetlinks:jetlinks
   jetlinks:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:1.20.0-SNAPSHOT
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:2.0.0-SNAPSHOT
     container_name: jetlinks-ce
     ports:
       - "8848:8848" # API端口
       - "1883-1890:1883-1890" # 预留
-      - "8000-8010:8000-8010" # 预留
+      - "8800-8810:8800-8810" # 预留
+      - "5060-5061:5060-5061" # 预留
     volumes:
       - "jetlinks-volume:/application/static/upload"  # 持久化上传的文件
       - "jetlinks-file-volume:/application/data/files"
@@ -90,6 +91,19 @@ services:
       - "logging.level.org.jetlinks=warn"
       - "logging.level.org.hswebframework=warn"
       - "logging.level.org.springframework.data.r2dbc.connectionfactory=warn"
+      - "network.resources[0]=0.0.0.0:8800-8810/tcp"
+      - "network.resources[1]=0.0.0.0:1883-1890"
+      - "hsweb.cors.enable=true"
+      - "hsweb.cors.configs[0].path=/**"
+      - "hsweb.cors.configs[0].allowed-credentials=true"
+      - "hsweb.cors.configs[0].allowed-headers=*"
+      - "hsweb.cors.configs[0].allowed-origins=*"
+      - "hsweb.cors.configs[0].allowed-methods[0]=GET"
+      - "hsweb.cors.configs[0].allowed-methods[1]=POST"
+      - "hsweb.cors.configs[0].allowed-methods[2]=PUT"
+      - "hsweb.cors.configs[0].allowed-methods[3]=PATCH"
+      - "hsweb.cors.configs[0].allowed-methods[4]=DELETE"
+      - "hsweb.cors.configs[0].allowed-methods[5]=OPTIONS"
     links:
       - redis:redis
       - postgres:postgres

jetlinks-components/notify-component/notify-voice/src/main/java/org/jetlinks/community/notify/voice/aliyun/AliyunVoiceTemplate.java

@@ -31,7 +31,6 @@ public class AliyunVoiceTemplate extends AbstractTemplate<AliyunVoiceTemplate> {
 
     private String calledShowNumbers;
 
-    @NotBlank(message = "[calledNumber]不能为空")
     private String calledNumber;
 
     @Schema(description = "通知播放次数")

jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/enums/SubscribeState.java

@@ -7,8 +7,8 @@ import org.hswebframework.web.dict.EnumDict;
 @Getter
 @AllArgsConstructor
 public enum SubscribeState implements EnumDict<String> {
-    enabled("订阅中"),
-    disabled("已停止");
+    enabled("正常"),
+    disabled("禁用");
 
     private final String text;