pzc лет назад: 4
Родитель
Сommit
fb13f93c89

+ 15 - 17
UI/src/utils/config.js

@@ -1,11 +1,11 @@
 const APIV1 = '/api/v1'
-const APIV2 = '/api/v2' 
+const APIV2 = '/api/v2'
 const APIV3 = 'http://localhost:8004'
-const APIV4 = 'http://192.168.50.32:8006'
+const APIV4 = 'http://localhost:8005'
 
-const APIV3Auth = 'http://192.168.50.32:8031'
-const WXAPIV5= 'http://localhost:7000'
-const WXMpAPI= 'http://localhost:8081'
+const APIV3Auth = 'http://119.130.113.245:8030'
+const WXAPIV5= 'http://219.128.77.86:7000'
+const WXMpAPI= 'http://219.128.77.86:7001'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
@@ -13,18 +13,15 @@ module.exports =  {
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: ['http://localhost:8000',
-  'http://localhost:8030',
-  'http://192.168.50.32:8031',
-  'http://localhost:8080',
-  'http://192.168.50.32:8030',
-  'http://localhost:8004',
-  'http://192.168.50.32:8006',
-  'http://localhost:8030',
-  'http://192.168.50.32:8031',
-  'http://localhost:8081',
-  'http://192.168.50.32:8081',
-  'http://localhost:7000'],
+  CORS: [
+    'http://localhost:8000',
+    'http://localhost:8004',
+    'http://localhost:8005',
+    'http://119.130.113.245:7001',
+    'http://119.130.113.245:8030',
+    'http://219.128.77.86:7000',
+    'http://219.128.77.86:7001',
+   ],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
@@ -63,4 +60,5 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
+  APIV4, 
 }

+ 17 - 15
UI/src/utils/config3.js

@@ -1,11 +1,11 @@
 const APIV1 = '/api/v1'
-const APIV2 = '/api/v2'
+const APIV2 = '/api/v2' 
 const APIV3 = 'http://localhost:8004'
-const APIV4 = 'http://localhost:8005'
+const APIV4 = 'http://192.168.50.32:8006'
 
-const APIV3Auth = 'http://119.130.113.245:8030'
-const WXAPIV5= 'http://219.128.77.86:7000'
-const WXMpAPI= 'http://219.128.77.86:7001'
+const APIV3Auth = 'http://192.168.50.32:8031'
+const WXAPIV5= 'http://localhost:7000'
+const WXMpAPI= 'http://localhost:8081'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
@@ -13,15 +13,18 @@ module.exports =  {
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: [
-    'http://localhost:8000',
-    'http://localhost:8004',
-    'http://localhost:8005',
-    'http://119.130.113.245:7001',
-    'http://119.130.113.245:8030',
-    'http://219.128.77.86:7000',
-    'http://219.128.77.86:7001',
-   ],
+  CORS: ['http://localhost:8000',
+  'http://localhost:8030',
+  'http://192.168.50.32:8031',
+  'http://localhost:8080',
+  'http://192.168.50.32:8030',
+  'http://localhost:8004',
+  'http://192.168.50.32:8006',
+  'http://localhost:8030',
+  'http://192.168.50.32:8031',
+  'http://localhost:8081',
+  'http://192.168.50.32:8081',
+  'http://localhost:7000'],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
@@ -60,5 +63,4 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
-  APIV4, 
 }

+ 20 - 20
mpwechatApp/src/main/java/com/liangjian11/wx/mp/handler/SubscribeHandler.java

@@ -131,26 +131,26 @@ public class SubscribeHandler extends AbstractHandler {
                  * 医生信息:{{keyword4.DATA}}
                  * {{remark.DATA}}
                  */
-                List<WxMpTemplateData> data = new ArrayList<>(6);
-                data.add(new WxMpTemplateData("first","首部内容"));
-                data.add(new WxMpTemplateData("keyword1","患者姓名"));
-                data.add(new WxMpTemplateData("keyword2","预约时间"));
-                data.add(new WxMpTemplateData("keyword3","提醒事项"));
-                data.add(new WxMpTemplateData("keyword4","医生信息"));
-                data.add(new WxMpTemplateData("remark","尾部内容"));
-                String msgContent = JsonUtils.toJson(data);
-                String miniProgramConfigs = "";
-//                String miniProgramConfigs = "{\"appid\":\"appid\",\"pagePath\":\"pagePath\",\"usePath\":false}";
-                String toUserOpenId = null;
-//                String msgTempId = "Q4QjIZx3JaElMfGgs-7BYw15s4Ug_RBU0fk47WHMy1Y";
-                String msgTempId = null;
-                String msgId = null;
-                String url ="http://mem.360lj.com/mp/MP_verify_a7BoBigq6zwqnrM1.txt";
-                fansuUnionService.sendMsg(appAppId, appId,  fansUnion.getUserId().toString(),   1,
-                    msgTempId,  msgId,
-                    null,msgContent ,
-                    miniProgramConfigs,   toUserOpenId,    url,
-                    weixinService, channelPortService);
+//                List<WxMpTemplateData> data = new ArrayList<>(6);
+//                data.add(new WxMpTemplateData("first","首部内容"));
+//                data.add(new WxMpTemplateData("keyword1","患者姓名"));
+//                data.add(new WxMpTemplateData("keyword2","预约时间"));
+//                data.add(new WxMpTemplateData("keyword3","提醒事项"));
+//                data.add(new WxMpTemplateData("keyword4","医生信息"));
+//                data.add(new WxMpTemplateData("remark","尾部内容"));
+//                String msgContent = JsonUtils.toJson(data);
+//                String miniProgramConfigs = "";
+////                String miniProgramConfigs = "{\"appid\":\"appid\",\"pagePath\":\"pagePath\",\"usePath\":false}";
+//                String toUserOpenId = null;
+////                String msgTempId = "Q4QjIZx3JaElMfGgs-7BYw15s4Ug_RBU0fk47WHMy1Y";
+//                String msgTempId = null;
+//                String msgId = null;
+//                String url ="http://mem.360lj.com/mp/MP_verify_a7BoBigq6zwqnrM1.txt";
+//                fansuUnionService.sendMsg(appAppId, appId,  fansUnion.getUserId().toString(),   1,
+//                    msgTempId,  msgId,
+//                    null,msgContent ,
+//                    miniProgramConfigs,   toUserOpenId,    url,
+//                    weixinService, channelPortService);