Merge remote-tracking branch 'origin/develop' into obf

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/manager/HolidayManager.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -21,6 +22,9 @@ public class HolidayManager {
     @Autowired
     private RedisUtil redisUtil;
 
+    @Value("${transfer.server.url:101.201.149.156:8610}")
+    private String domainUrl;
+
     //@Scheduled(cron = "0 0 0 1 1 ? *")
     @Scheduled(cron = "0 0 0 1 1 ?")
     @PostConstruct
@@ -69,7 +73,7 @@ public class HolidayManager {
         //补班数据
         List<String> listRemove = new ArrayList<String>();
 
-        String url = "http://timor.tech/api/holiday/year/" + year + "/";
+        String url = "http://"+domainUrl+"/api/holiday/year/" + year + "/";
         String rsa = HttpUtil.get(url);
         Map map = JSONObject.parseObject(rsa, Map.class);
         Map holidayMap = (Map) map.get("holiday");

jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java

@@ -14,13 +14,13 @@ import org.springframework.stereotype.Component;
 @Data
 public class StaticConfig {
 
-    @Value("${jeecg.oss.accessKey}")
+    @Value("${jeecg.oss.accessKey:}")
     private String accessKeyId;
 
-    @Value("${jeecg.oss.secretKey}")
+    @Value("${jeecg.oss.secretKey:}")
     private String accessKeySecret;
 
-    @Value(value = "${spring.mail.username}")
+    @Value(value = "${spring.mail.username:}")
     private String emailFrom;
 
     static {

jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java

@@ -13,13 +13,13 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class OssConfiguration {
 
-    @Value("${jeecg.oss.endpoint}")
+    @Value("${jeecg.oss.endpoint:}")
     private String endpoint;
-    @Value("${jeecg.oss.accessKey}")
+    @Value("${jeecg.oss.accessKey:}")
     private String accessKeyId;
-    @Value("${jeecg.oss.secretKey}")
+    @Value("${jeecg.oss.secretKey:}")
     private String accessKeySecret;
-    @Value("${jeecg.oss.bucketName}")
+    @Value("${jeecg.oss.bucketName:}")
     private String bucketName;
     @Value("${jeecg.oss.staticDomain:}")
     private String staticDomain;

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java

@@ -50,8 +50,8 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
     /**
      * 在线预览文件地址
      */
-    @Value("${jeecg.file-view-domain}/onlinePreview")
-    private String onlinePreviewDomain;
+//    @Value("${jeecg.file-view-domain}/onlinePreview")
+//    private String onlinePreviewDomain;
 
     /**
      * 查询评论+文件
@@ -130,10 +130,10 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
      *
      * @return
      */
-    @GetMapping(value = "/getFileViewDomain")
-    public Result<String> getFileViewDomain() {
-        return Result.OK(onlinePreviewDomain);
-    }
+//    @GetMapping(value = "/getFileViewDomain")
+//    public Result<String> getFileViewDomain() {
+//        return Result.OK(onlinePreviewDomain);
+//    }
 
 
     /**