Browse Source

20210810TALL3

tall3
zy_Java 4 years ago
parent
commit
bf95b6bd62
  1. 1
      cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
  2. 68
      cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java
  3. 8
      cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java
  4. 7
      ht/src/main/java/com/ccsens/ht/api/IndexController.java
  5. 1
      ht/src/main/java/com/ccsens/ht/service/PatientService.java
  6. 3
      recovery/src/main/java/com/ccsens/recovery/service/MessageService.java
  7. 2
      signin/src/main/java/com/ccsens/signin/config/SpringConfig.java
  8. 10
      signin/src/main/resources/application-prod.yml
  9. 4
      signin/src/main/resources/application-test.yml
  10. 4
      signin/src/main/resources/application.yml
  11. 2
      signin/src/main/resources/logback-spring.xml

1
cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java

@ -3,7 +3,6 @@ package com.ccsens.cloudutil.aspect;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.cloudutil.bean.tall.dto.LogDto;
import com.ccsens.cloudutil.bean.tall.vo.UserVo;
import com.ccsens.cloudutil.feign.TallFeignClient;
import com.ccsens.util.UploadFileUtil_Servlet3;
import com.ccsens.util.WebConstant;

68
cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java

@ -0,0 +1,68 @@
package com.ccsens.cloudutil.feign;
import com.ccsens.cloudutil.bean.tall.dto.LogDto;
import com.ccsens.cloudutil.bean.tall.dto.ProjectDto;
import com.ccsens.cloudutil.config.FeignTokenConfig;
import com.ccsens.util.JsonResponse;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @author
*/
@FeignClient(name = "tall3", path = "v3.0",fallbackFactory = Tall3FeignClientFallBack.class)
public interface Tall3FeignClient {
/**
* 根据token获取userId
*
* @param token
* @return
*/
@GetMapping("users/token")
JsonResponse getUserIdByToken(@RequestParam(required = true, name = "token") String token);
/**
* 记录操作日志
*
* @param logDto
* @return
*/
@RequestMapping("/log/operation")
JsonResponse log(LogDto logDto);
/**
* 在tall3内保存项目信息
*/
@RequestMapping("/project/save")
JsonResponse saveProjectList(ProjectDto.SaveProjectDto projectDto);
}
@Slf4j
@Component
class Tall3FeignClientFallBack implements FallbackFactory<Tall3FeignClient> {
@Override
public Tall3FeignClient create(Throwable cause) {
log.error("访问tall3异常", cause);
return new Tall3FeignClient() {
@Override
public JsonResponse getUserIdByToken(String token) {
return null;
}
@Override
public JsonResponse log(LogDto logDto) {
return null;
}
@Override
public JsonResponse saveProjectList(ProjectDto.SaveProjectDto projectDto) {
return null;
}
};
}
}

8
cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java

@ -1,6 +1,5 @@
package com.ccsens.cloudutil.feign;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.cloudutil.bean.QueryParam;
import com.ccsens.cloudutil.bean.tall.dto.*;
import com.ccsens.cloudutil.bean.tall.vo.*;
@ -11,11 +10,8 @@ import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@ -180,7 +176,7 @@ public interface TallFeignClient {
@GetMapping("/v1/3rd/getFilePath")
String getWpsFilePath(@RequestParam(name = "businessId") Long businessId,@RequestParam(name = "businessType") byte businessType);
/**
/**
* 通过userId呵taskId查找用户信息
*/
@GetMapping("/users/memberByTask")
@ -279,7 +275,7 @@ public interface TallFeignClient {
/**
* 保存WPS业务和文件记录
* 在tall3内保存项目信息
*/
@RequestMapping("/project/save")
JsonResponse saveProjectList(ProjectDto.SaveProjectDto projectDto);

7
ht/src/main/java/com/ccsens/ht/api/IndexController.java

@ -2,18 +2,11 @@ package com.ccsens.ht.api;
import com.ccsens.cloudutil.bean.QueryParam;
import com.ccsens.cloudutil.feign.TallFeignClient;
import com.ccsens.util.PropUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.configurationprocessor.json.JSONException;
import org.springframework.boot.configurationprocessor.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.Map;

1
ht/src/main/java/com/ccsens/ht/service/PatientService.java

@ -31,7 +31,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @program: ptpro

3
recovery/src/main/java/com/ccsens/recovery/service/MessageService.java

@ -2,7 +2,6 @@ package com.ccsens.recovery.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.cloudutil.feign.TallFeignClient;
import com.ccsens.recovery.bean.message.*;
import com.ccsens.recovery.bean.po.Patient;
@ -24,9 +23,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static com.ccsens.recovery.netty.ChannelManager.sendTo;

2
signin/src/main/java/com/ccsens/signin/config/SpringConfig.java

@ -116,7 +116,7 @@ public class SpringConfig implements WebMvcConfigurer {
.addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/uploads/**")
.addResourceLocations("file:///home/cloud/game/uploads/");
.addResourceLocations("file:///home/cloud/tall3/uploads/");
//super.addResourceHandlers(registry);
}

10
signin/src/main/resources/application-prod.yml

@ -1,13 +1,13 @@
server:
port: 7130
servlet:
context-path: /v1.0
context-path: /v3.0
spring:
snowflake:
datacenterId: 1
workerId: 1
application:
name: tall
name: tall3
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
@ -35,7 +35,7 @@ eureka:
# www.tall.wiki
# ip-address: 140.143.228.3
# ip-address: 81.70.54.64
ip-address: 121.36.3.207
ip-address: 127.0.0.1
gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/
@ -44,5 +44,5 @@ wx:
prefixUrl: https://www.tall.wiki/wxconfigurer-api/
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
domain: https://www.tall.wiki/gateway/tall/v3.0/
imgDomain: https://www.tall.wiki/gateway/tall/v3.0/uploads

4
signin/src/main/resources/application-test.yml

@ -1,13 +1,13 @@
server:
port: 7130
servlet:
context-path: /v1.0
context-path: /v3.0
spring:
snowflake:
datacenterId: 1
workerId: 1
application:
name: tall
name: tall3
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:

4
signin/src/main/resources/application.yml

@ -1,5 +1,5 @@
spring:
profiles:
active: dev
include: util-dev,common
active: test
include: util-test,common

2
signin/src/main/resources/logback-spring.xml

@ -9,7 +9,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
<property name="log.path" value="/home/cloud/signin/log/" />
<property name="log.path" value="/home/cloud/tall3/log/" />
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->

Loading…
Cancel
Save