Merge branch 'github_feat/zone' into tenant-dev

Author: wuyzh39

src/backend/commons/common-i18n/src/main/java/com/tencent/bk/job/common/i18n/zone/TimeZoneConstants.java

@@ -31,6 +31,16 @@
  */
 public class TimeZoneConstants {
 
+    /**
+     * 默认展示时区配置属性key
+     */
+    public static final String KEY_DISPLAY_TIMEZONE_CONFIG = "display";
+
+    /**
+     * 默认运营时区配置属性key
+     */
+    public static final String KEY_OPERATION_TIMEZONE_CONFIG = "operation";
+
     /**
      * 默认时区：东八区
      */

src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/model/CronJobCreateUpdateReq.java

@@ -170,7 +170,8 @@ public class CronJobCreateUpdateReq {
     /**
      * 周期执行的结束时间
      */
-    @ApiModelProperty("周期执行的结束时间")
+    @ApiModelProperty("周期执行的结束时间，单位毫秒")
+    @JsonDeserialize(using = ToSecondDeserializer.class)
     private Long endTime = 0L;
 
 }

src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/model/dto/CronJobInfoDTO.java

@@ -193,7 +193,7 @@ public class CronJobInfoDTO extends EncryptEnableVariables {
     private CustomNotifyDTO customCronJobNotifyDTO = new CustomNotifyDTO();
 
     /**
-     * 周期执行结束时间
+     * 周期执行结束时间，在DB中存储的单位是秒
      */
     private Long endTime = 0L;
 

src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/common/constants/globalsetting/RelatedUrlKeys.java

@@ -45,4 +45,6 @@ public class RelatedUrlKeys {
     public static final String KEY_BK_LOGIN_URL = "BK_LOGIN_URL";
     // 用户管理SaaS Web页面根地址
     public static final String KEY_BK_USER_WEB_ROOT_URL = "BK_USER_WEB_ROOT_URL";
+    // 权限中心页面地址
+    public static final String KEY_BK_IAM_WEB_URL = "BK_IAM_WEB_URL";
 }

src/backend/job-manage/api-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/WebGlobalSettingsQueryResource.java

@@ -148,9 +148,9 @@ Response<Map<String, Object>> getJobConfig(
             String username
     );
 
-    @ApiOperation(value = "获取默认展示时区", produces = "application/json")
-    @GetMapping("/defaultDisplayTimezone")
-    Response<String> getDefaultDisplayTimezone(
+    @ApiOperation(value = "获取配置的默认时区", produces = "application/json")
+    @GetMapping("/defaultTimezoneConfig")
+    Response<Map<String, String>> getDefaultDisplayTimezone(
         @ApiParam("用户名，网关自动传入")
         @RequestHeader("username")
             String username

src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/web/impl/WebGlobalSettingsQueryResourceImpl.java

@@ -28,6 +28,7 @@
 import com.tencent.bk.job.analysis.consts.AnalysisConsts;
 import com.tencent.bk.job.common.constant.ResourceScopeTypeEnum;
 import com.tencent.bk.job.common.i18n.config.DefaultTimezoneProperties;
+import com.tencent.bk.job.common.i18n.zone.TimeZoneConstants;
 import com.tencent.bk.job.common.iam.constant.ActionId;
 import com.tencent.bk.job.common.iam.model.AuthResult;
 import com.tencent.bk.job.common.iam.service.AppAuthService;
@@ -53,6 +54,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -268,8 +270,11 @@ public Response<Map<String, Object>> getJobConfig(String username) {
     }
 
     @Override
-    public Response<String> getDefaultDisplayTimezone(String username) {
-        return Response.buildSuccessResp(defaultTimezoneProperties.getDisplay());
+    public Response<Map<String, String>> getDefaultDisplayTimezone(String username) {
+        Map<String, String> config = new HashMap<>();
+        config.put(TimeZoneConstants.KEY_DISPLAY_TIMEZONE_CONFIG, defaultTimezoneProperties.getDisplay());
+        config.put(TimeZoneConstants.KEY_OPERATION_TIMEZONE_CONFIG, defaultTimezoneProperties.getOperation());
+        return Response.buildSuccessResp(config);
     }
 
     @Override

src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/config/JobManageConfig.java

@@ -133,4 +133,9 @@ public class JobManageConfig {
      */
     @Value("${bk-user.url:bk-user.example.com}")
     private String bkUserWebUrl;
+
+    //------------------------------- BK-IAM ----------------------------------------------
+
+    @Value("${iam.web-url:bkiam.example.com}")
+    private String bkIamWebUrl;
 }

src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/service/globalsetting/impl/GlobalSettingsServiceImpl.java

@@ -662,6 +662,10 @@ private String getBkUserWebRootUrl() {
         return jobManageConfig.getBkUserWebUrl();
     }
 
+    private String getBkIamWebUrl() {
+        return jobManageConfig.getBkIamWebUrl();
+    }
+
     private String getNodemanRootUrl() {
         String url = jobManageConfig.getNodemanServerUrl();
         if (StringUtils.isBlank(url)) {
@@ -688,6 +692,7 @@ public Map<String, String> getRelatedSystemUrls(String username) {
         urlMap.put(RelatedUrlKeys.KEY_BK_USER_WEB_API_ROOT_URL, getBkUserWebApiRootUrl());
         urlMap.put(RelatedUrlKeys.KEY_BK_LOGIN_URL, getBkLoginUrl());
         urlMap.put(RelatedUrlKeys.KEY_BK_USER_WEB_ROOT_URL, getBkUserWebRootUrl());
+        urlMap.put(RelatedUrlKeys.KEY_BK_IAM_WEB_URL, getBkIamWebUrl());
         return urlMap;
     }