4 Commit-ok 820128cb26 ... f122eeed78

Szerző SHA1 Üzenet Dátum
  LAPTOP-KB9HII50\70708 f122eeed78 Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev 2 hete
  LAPTOP-KB9HII50\70708 80be49ef08 代码修改 2 hete
  LAPTOP-KB9HII50\70708 73eb48a1db 代码修改 2 hete
  LAPTOP-KB9HII50\70708 2a2f816304 代码修改 3 hónapja

+ 1 - 1
svr/svr-cloud-care/pom.xml

@ -288,7 +288,7 @@
        </dependency>
    </dependencies>
    <build>
        <finalName>svr-cloud-care</finalName>
        <finalName>svr-cloud-care-test</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

+ 1 - 1
svr/svr-cloud-care/src/main/resources/application.yml

@ -389,7 +389,7 @@ testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: https://ijk.xmyys.com.cn/wlyytest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy

+ 1 - 1
svr/svr-cloud-transfor/src/main/java/com/yihu/jw/care/service/WeixinMchApi.java

@ -25,7 +25,7 @@ public class WeixinMchApi {
    public static String merchantSerialNumber = "4B4EB542718B4C91DCCCB294D6BCA10DEF204C90"; //商户证书序列号
    public static String apiV3Key = "23FB41D6808D16668E7A4F4BE251FD1C";//商户APIV3密钥
    public static String appid = "wxad04e9c4c5255acf";//公众号appid
    public static String notifyUrl = "https://www.xmtyw.cn/wlyytest/wx/Openid/notifyUrl";//回调url
    public static String notifyUrl = "https://ijk.xmyys.com.cn/wlyytest/wx/Openid/notifyUrl";//回调url
    public static TransferBatchService service;

+ 1 - 1
svr/svr-iot/src/main/java/com/yihu/iot/datainput/service/DataInputService.java

@ -525,7 +525,7 @@ public class DataInputService {
    @Async
    public void uploadDataToWlyy(String json){
        String url ="https://www.xmtyw.cn/wlyytest/third/syncDisPatient/common/iotDataImportData";
        String url ="https://ijk.xmyys.com.cn/wlyytest/third/syncDisPatient/common/iotDataImportData";
        if ("iotprodIn".equals(profiles)){
            url = "http://10.95.22.10:8011/wlyy/third/syncDisPatient/common/iotDataImportData";
        }