diff --git a/tall/src/main/java/com/ccsens/tall/TallApplication.java b/tall/src/main/java/com/ccsens/tall/TallApplication.java index 4115321d..421190cc 100644 --- a/tall/src/main/java/com/ccsens/tall/TallApplication.java +++ b/tall/src/main/java/com/ccsens/tall/TallApplication.java @@ -1,6 +1,10 @@ package com.ccsens.tall; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.PropUtil; +import com.ccsens.util.RestTemplateUtil; import com.ccsens.util.WebConstant; +import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -10,6 +14,7 @@ import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableAsync; +import javax.annotation.Resource; import java.io.File; /** @@ -25,12 +30,15 @@ import java.io.File; @EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign") @SpringBootApplication(scanBasePackages = "com.ccsens") public class TallApplication implements CommandLineRunner { + public static void main(String[] args) { File dir = new File(WebConstant.IMG_PATH_PREFIX_SHARE_QR); if(!dir.exists()){ dir.mkdirs(); } SpringApplication.run(TallApplication.class, args); + + } @Override public void run(String... args) throws Exception { diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index c035b920..aee7521b 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -11,11 +11,11 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: -# host: 192.168.0.99 - host: 127.0.0.1 - password: guest + host: 192.168.31.13 +# host: 127.0.0.1 + password: 111111 port: 5672 - username: guest + username: admin redis: database: 0 host: 127.0.0.1 @@ -41,4 +41,8 @@ file: domain: http://localhost:7030/v1.0/ imgDomain: http://localhost:7030/v1.0/uploads #filedeal: http://localhost:8001/file/query -filedeal: https://test.tall.wiki/file/query \ No newline at end of file +filedeal: https://test.tall.wiki/file/query +project: + # redis是否需要加载 0:否 1 是 + redisUpdate: 1 + redisUpdateUrl: http://localhost:8001/constant/updateAll/ \ No newline at end of file diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml index 8191aeae..eae2197b 100644 --- a/tall/src/main/resources/application-prod.yml +++ b/tall/src/main/resources/application-prod.yml @@ -46,4 +46,8 @@ file: path: /home/cloud/tall/uploads/ domain: https://www.tall.wiki/gateway/tall/v1.0/ imgDomain: https://www.tall.wiki/gateway/tall/v1.0/uploads -filedeal: https://www.tall.wiki/filedeal/file/query \ No newline at end of file +filedeal: https://www.tall.wiki/filedeal/file/query +project: + # redis是否需要加载 0:否 1 是 + redisUpdate: 1 + redisUpdateUrl: https://www.tall.wiki/filedeal/constant/updateAll/ \ No newline at end of file diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml index ab378fb7..d10fd999 100644 --- a/tall/src/main/resources/application-test.yml +++ b/tall/src/main/resources/application-test.yml @@ -47,6 +47,10 @@ file: domain: https://test.tall.wiki/gateway/tall/v1.0/ imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads filedeal: https://test.tall.wiki/filedeal/file/query +project: + # redis是否需要加载 0:否 1 是 + redisUpdate: 1 + redisUpdateUrl: http://127.0.0.1:8001/constant/updateAll/ #file: # domain: http://192.168.0.99/gateway/tall/v1.0/ # imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/PropUtil.java b/util/src/main/java/com/ccsens/util/PropUtil.java index 61beb6c4..3b04da69 100644 --- a/util/src/main/java/com/ccsens/util/PropUtil.java +++ b/util/src/main/java/com/ccsens/util/PropUtil.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Component; */ @Component public class PropUtil { + public static String application; public static String path; public static String domain; public static String imgDomain; @@ -29,7 +30,15 @@ public class PropUtil { public static String getWpsFilePath; public static String accessPath; public static String filedeal; + /**redis是否需要更新*/ + public static String redisUpdate; + public static String redisUpdateUrl; + public static final String REDIS_UPDATE_YES = "1"; + @Value("${spring.application.name:}") + public void setApplication(String application) { + PropUtil.application = application; + } @Value("${saveWpsFile:}") public void setSaveWpsFile(String saveWpsFile) { PropUtil.saveWpsFile = saveWpsFile; @@ -104,4 +113,12 @@ public class PropUtil { public void setFiledeal(String filedeal) { PropUtil.filedeal = filedeal; } + @Value("${project.redisUpdate:}") + public void setRedisUpdate(String redisUpdate) { + PropUtil.redisUpdate = redisUpdate; + } + @Value("${project.redisUpdateUrl:}") + public void setRedisUpdateUrl(String redisUpdateUrl) { + PropUtil.redisUpdateUrl = redisUpdateUrl; + } } diff --git a/util/src/main/java/com/ccsens/util/RestTemplateUtil.java b/util/src/main/java/com/ccsens/util/RestTemplateUtil.java index f26d16ca..89ad9df5 100644 --- a/util/src/main/java/com/ccsens/util/RestTemplateUtil.java +++ b/util/src/main/java/com/ccsens/util/RestTemplateUtil.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.annotation.Order; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -36,6 +37,10 @@ public class RestTemplateUtil { public void init(){ util = this; util.restTemplate = this.restTemplate; + if (PropUtil.REDIS_UPDATE_YES.equals(PropUtil.redisUpdate)) { + String result = postUrlEncode(PropUtil.redisUpdateUrl + PropUtil.application, null); + log.info("更新缓存结果:{}", result); + } } public static Object getForEntity(String url, Map params, Class returnClass) { diff --git a/util/src/main/java/com/ccsens/util/WebConstant.java b/util/src/main/java/com/ccsens/util/WebConstant.java index e1c58536..d3bf817c 100644 --- a/util/src/main/java/com/ccsens/util/WebConstant.java +++ b/util/src/main/java/com/ccsens/util/WebConstant.java @@ -28,6 +28,7 @@ public class WebConstant { } + public static class Wx{ public static final String ACCESS_TOKEN = "tall_wx_access_token_"; public static final long EXPIRE_TIME = 1 * 60 * 60; diff --git a/util/src/main/java/com/ccsens/util/config/CommonConfig.java b/util/src/main/java/com/ccsens/util/config/CommonConfig.java index 5adc59a8..92ef3d3f 100644 --- a/util/src/main/java/com/ccsens/util/config/CommonConfig.java +++ b/util/src/main/java/com/ccsens/util/config/CommonConfig.java @@ -1,11 +1,18 @@ package com.ccsens.util.config; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.PropUtil; +import com.ccsens.util.RestTemplateUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; +import javax.annotation.PostConstruct; + /** * @program: ptpro * @description: 常用配置 restTemplate @@ -13,6 +20,7 @@ import org.springframework.web.client.RestTemplate; * @create: 2019/10/28 16:12 */ @Configuration +@Slf4j public class CommonConfig { // @Bean @@ -26,6 +34,7 @@ public class CommonConfig { // return restTemplate; // } + @Bean public RestTemplate restTemplate(ClientHttpRequestFactory factory){ return new RestTemplate(factory); @@ -39,4 +48,6 @@ public class CommonConfig { return factory; } + + }