Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/common/FileUploadController.java

@@ -6,21 +6,23 @@ import com.yihu.jw.restmodel.iot.common.UploadVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.rm.specialist.SpecialistMapping;
import com.yihu.jw.service.FileUploadService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.net.URLDecoder;
import java.util.Base64;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
/**
@@ -36,10 +38,6 @@ public class FileUploadController {
    @Value("${fast-dfs.public-server}")
    private String fastdfs_file_url;
    @Autowired
    private FileUploadService fileUploadService;
    @Value("${neiwang.enable}")
    private Boolean isneiwang;  //如果不是内网项目要转到到内网在上传
    @Autowired
    protected HttpServletRequest request;

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/FileUploadService.java

@@ -1,17 +0,0 @@
package com.yihu.jw.service;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
/**
 * @author zhangdan on 2018/08/22.
 */
@Service
public class FileUploadService{
    @Value("${neiwang.wlyy}")
    private String neiwangWlyy;  //内网的项目地址
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationPlanService.java

@@ -2,7 +2,6 @@ package com.yihu.jw.service.rehabilitation;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.dao.rehabilitation.*;
import com.yihu.jw.entity.rehabilitation.RehabilitationPlanningDO;
import com.yihu.jw.entity.specialist.HospitalServiceItemDO;
@@ -15,7 +14,6 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.rm.specialist.SpecialistMapping;
import com.yihu.jw.service.FileUploadService;
import com.yihu.jw.service.SpecialistHospitalServiceItemService;
import com.yihu.jw.service.SpecialistService;
import com.yihu.jw.util.date.DateUtil;
@@ -42,18 +40,11 @@ import java.util.stream.Collectors;
@Transactional
public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlanningDO, RehabilitationPlanTemplateDao> {
    @Value("${neiwang.enable}")
    private Boolean isneiwang;  //如果不是内网项目要转到到内网wlyy在上传
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @Value("${base.url}")
    private String baseUrl;
    @Value("${basedb.name}")
    private String basedb;
    @Value("${wechat.wechat_base_url}")
    private String wechat_base_url;
    @Value("${wechat.appId}")
    private String appId;
    @Autowired
    private RehabilitationPlanTemplateDao templateDao;
@@ -66,10 +57,6 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private FastDFSUtil fastDFSHelper;
    @Autowired
    private FileUploadService fileUploadService;
    @Autowired
    protected HttpServletRequest request;
    @Autowired
    private RehabilitationOperateRecordsDao rehabilitationOperateRecordsDao;

svr/svr-wlyy-specialist/src/main/resources/application.yml

@@ -246,3 +246,39 @@ wechat:
im:
  im_list_get: http://27.155.101.77:3000/
  data_base_name: im
---
spring:
  profiles: hzprod
  datasource:
    url: jdbc:mysql://10.18.43.40:3306/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy
    password: '0XxS3W*!cRj'
  redis:
    host: 10.18.43.40 # Redis server host.
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: https://zhyzh.gongshu.gov.cn/fastdfs/
fast-dfs:
  tracker-server: 10.18.43.40:22122
  public-server: http://10.18.43.40:80/
neiwang:
  enable: true
  wlyy: http://59.61.92.90:9099/iot/
base:
  url: http://192.168.120.96:10020/svr-base/
wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fwlyy
  accId: gh_ffd64560fb21
im:
  im_list_get: http://10.18.43.41:3000/
  data_base_name: im_internet_hospital

svr/svr-wlyy-specialist/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-wlyy-specialist
    name: svr-wlyy-specialist-ysj
  cloud:
    config:
      failFast: true