Skip to content

张雷 / fmboot

转到一个项目
切换导航栏
切换导航栏固定状态
a30d7c24 由 张雷
选项

奥体项目实时数据接口修改

1 个父辈 7a86522a
全部展开
内嵌 并排
正在显示 17 个修改的文件 包含 259 行增加 和 24 行删除
fm-product/src/main/java/com/skua/modules/business/controller/OlympicCenterController.java
...@@ -39,6 +39,16 @@ public class OlympicCenterController { ...@@ -39,6 +39,16 @@ public class OlympicCenterController {
39 return result; 39 return result;
40 } 40 }
41 41
42 @ApiOperation(value="获取整体实时数据", notes="获取整体实时数据")
43 @GetMapping(value = "/getRealTimeDataNew")
44 public Result<Map<String,Object>> getRealTimeDataNew(String sourceType){
45 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
46 Map<String,Object> map = olympicCenterService.getRealTimeDataNew(sourceType);
47 result.setResult(map);
48 result.setSuccess(true);
49 return result;
50 }
51
42 @ApiOperation(value="获取整体实时数据给UE", notes="获取整体实时数据给UE") 52 @ApiOperation(value="获取整体实时数据给UE", notes="获取整体实时数据给UE")
43 @GetMapping(value = "/getRealTimeDataToUE") 53 @GetMapping(value = "/getRealTimeDataToUE")
44 public Result<Map<String,Object>> getRealTimeDataToUE(){ 54 public Result<Map<String,Object>> getRealTimeDataToUE(){
...@@ -49,6 +59,16 @@ public class OlympicCenterController { ...@@ -49,6 +59,16 @@ public class OlympicCenterController {
49 return result; 59 return result;
50 } 60 }
51 61
62 @ApiOperation(value="获取整体实时数据给UE", notes="获取整体实时数据给UE")
63 @GetMapping(value = "/getRealTimeDataToUENew")
64 public Result<Map<String,Object>> getRealTimeDataToUENew(){
65 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
66 Map<String,Object> map = olympicCenterService.getRealTimeDataToUENew();
67 result.setResult(map);
68 result.setSuccess(true);
69 return result;
70 }
71
52 /** 72 /**
53 * 获取泵站指标历史趋势曲线 73 * 获取泵站指标历史趋势曲线
54 * @param field ssll:瞬时流量 ljll:累计流量 rll:日流量 74 * @param field ssll:瞬时流量 ljll:累计流量 rll:日流量
...@@ -108,4 +128,15 @@ public class OlympicCenterController { ...@@ -108,4 +128,15 @@ public class OlympicCenterController {
108 return result; 128 return result;
109 } 129 }
110 130
131 @ApiOperation(value="获取趋势图", notes="获取趋势图")
132 @GetMapping(value = "/getPressureChartNew")
133 public Result<List<EchartResult>> getPressureChartNew(String equipId,String type){
134 Result<List<EchartResult>> result = new Result<List<EchartResult>>();
135 List<EchartResult> list = new ArrayList<EchartResult>();
136 list = olympicCenterService.getPressureChartNew(equipId,type);
137 result.setResult(list);
138 result.setSuccess(true);
139 return result;
140 }
141
111 } 142 }
......
fm-product/src/main/java/com/skua/modules/business/mapper/WhatStructDataMapper.java
...@@ -15,4 +15,10 @@ public interface WhatStructDataMapper { ...@@ -15,4 +15,10 @@ public interface WhatStructDataMapper {
15 List<WhatStructData> getListForUE(); 15 List<WhatStructData> getListForUE();
16 16
17 WhatStructData getOneById(@Param("id") String id); 17 WhatStructData getOneById(@Param("id") String id);
18
19 List<WhatStructData> getListByType(@Param("sourceType") String sourceType);
20
21 List<WhatStructData> getDataList(@Param("equipId") String equipId);
22
23 List<WhatStructData> getListForUENew();
18 } 24 }
......
fm-product/src/main/java/com/skua/modules/business/mapper/xml/WhatStructDataMapper.xml
...@@ -14,4 +14,23 @@ ...@@ -14,4 +14,23 @@
14 select * from what_struct_data where id = #{id} limit 1 14 select * from what_struct_data where id = #{id} limit 1
15 </select> 15 </select>
16 16
17 <select id="getListByType" resultType="com.skua.modules.business.entity.WhatStructData">
18 select * from what_struct_data_bak
19 where 1=1
20 <if test="sourceType!=null and sourceType!=''">
21 and system_code = #{sourceType}
22 </if>
23 order by monitor_sort
24 </select>
25
26 <select id="getDataList" resultType="com.skua.modules.business.entity.WhatStructData">
27 select * from what_struct_data_bak
28 where id LIKE CONCAT( #{equipId},'%')
29 order by monitor_sort
30 </select>
31
32 <select id="getListForUENew" resultType="com.skua.modules.business.entity.WhatStructData">
33 select * from what_struct_data_bak order by monitor_sort
34 </select>
35
17 </mapper> 36 </mapper>
...\ No newline at end of file ...\ No newline at end of file
......
fm-product/src/main/java/com/skua/modules/business/service/IOlympicCenterService.java
...@@ -21,4 +21,10 @@ public interface IOlympicCenterService { ...@@ -21,4 +21,10 @@ public interface IOlympicCenterService {
21 Map<String, Object> getBzRealTimeData(String sourceType); 21 Map<String, Object> getBzRealTimeData(String sourceType);
22 22
23 Map<String, Object> getRealTimeDataToUE(); 23 Map<String, Object> getRealTimeDataToUE();
24
25 Map<String, Object> getRealTimeDataNew(String sourceType);
26
27 List<EchartResult> getPressureChartNew(String equipId, String type);
28
29 Map<String, Object> getRealTimeDataToUENew();
24 } 30 }
......
fm-product/src/main/java/com/skua/modules/location/controller/UserLocationController.java
...@@ -6,6 +6,7 @@ import com.skua.modules.location.UserLocationFactory; ...@@ -6,6 +6,7 @@ import com.skua.modules.location.UserLocationFactory;
6 import com.skua.modules.location.entity.UserBaseInfo; 6 import com.skua.modules.location.entity.UserBaseInfo;
7 import com.skua.modules.location.entity.UserLocation; 7 import com.skua.modules.location.entity.UserLocation;
8 import com.skua.modules.location.service.ILocationService; 8 import com.skua.modules.location.service.ILocationService;
9 import com.skua.modules.location.vo.QueryParams;
9 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
11 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
...@@ -14,7 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -14,7 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
14 import org.springframework.web.bind.annotation.RestController; 15 import org.springframework.web.bind.annotation.RestController;
15 16
16 import java.util.ArrayList; 17 import java.util.ArrayList;
18 import java.util.HashMap;
17 import java.util.List; 19 import java.util.List;
20 import java.util.Map;
18 21
19 @Slf4j 22 @Slf4j
20 @Api(tags="人员定位系统对接") 23 @Api(tags="人员定位系统对接")
...@@ -26,12 +29,12 @@ public class UserLocationController { ...@@ -26,12 +29,12 @@ public class UserLocationController {
26 @AutoLog(value = "义乌人员定位-获取所有人员列表") 29 @AutoLog(value = "义乌人员定位-获取所有人员列表")
27 @ApiOperation(value="义乌人员定位-获取所有人员列表", notes="义乌人员定位-获取所有人员列表") 30 @ApiOperation(value="义乌人员定位-获取所有人员列表", notes="义乌人员定位-获取所有人员列表")
28 @GetMapping(value = "/yw/getAllUser") 31 @GetMapping(value = "/yw/getAllUser")
29 public Result<List<UserBaseInfo>> getAllUserYW(String userName) { 32 public Result<Map<String,Object>> getAllUserYW(QueryParams queryParams) {
30 Result<List<UserBaseInfo>> result = new Result<List<UserBaseInfo>>(); 33 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
31 List<UserBaseInfo> list = new ArrayList<>(); 34 Map<String,Object> map = new HashMap<>();
32 ILocationService locationService = UserLocationFactory.getLocationService("YW"); 35 ILocationService locationService = UserLocationFactory.getLocationService("YW");
33 list = locationService.getAllUser(userName); 36 map = locationService.getAllUser(queryParams);
34 result.setResult(list); 37 result.setResult(map);
35 result.setSuccess(true); 38 result.setSuccess(true);
36 return result; 39 return result;
37 } 40 }
...@@ -66,12 +69,12 @@ public class UserLocationController { ...@@ -66,12 +69,12 @@ public class UserLocationController {
66 @AutoLog(value = "余杭人员定位-获取所有人员列表") 69 @AutoLog(value = "余杭人员定位-获取所有人员列表")
67 @ApiOperation(value="余杭人员定位-获取所有人员列表", notes="余杭人员定位-获取所有人员列表") 70 @ApiOperation(value="余杭人员定位-获取所有人员列表", notes="余杭人员定位-获取所有人员列表")
68 @GetMapping(value = "/yh/getAllUser") 71 @GetMapping(value = "/yh/getAllUser")
69 public Result<List<UserBaseInfo>> getAllUserBKYH(String userName) { 72 public Result<Map<String,Object>> getAllUserBKYH(QueryParams queryParams) {
70 Result<List<UserBaseInfo>> result = new Result<List<UserBaseInfo>>(); 73 Result<Map<String,Object>> result = new Result<Map<String,Object>>();
71 List<UserBaseInfo> list = new ArrayList<>(); 74 Map<String,Object> map = new HashMap<>();
72 ILocationService locationService = UserLocationFactory.getLocationService("BKYH"); 75 ILocationService locationService = UserLocationFactory.getLocationService("BKYH");
73 list = locationService.getAllUser(userName); 76 map = locationService.getAllUser(queryParams);
74 result.setResult(list); 77 result.setResult(map);
75 result.setSuccess(true); 78 result.setSuccess(true);
76 return result; 79 return result;
77 } 80 }
......
fm-product/src/main/java/com/skua/modules/location/service/ILocationService.java
...@@ -2,8 +2,10 @@ package com.skua.modules.location.service; ...@@ -2,8 +2,10 @@ package com.skua.modules.location.service;
2 2
3 import com.skua.modules.location.entity.UserBaseInfo; 3 import com.skua.modules.location.entity.UserBaseInfo;
4 import com.skua.modules.location.entity.UserLocation; 4 import com.skua.modules.location.entity.UserLocation;
5 import com.skua.modules.location.vo.QueryParams;
5 6
6 import java.util.List; 7 import java.util.List;
8 import java.util.Map;
7 9
8 public interface ILocationService { 10 public interface ILocationService {
9 11
...@@ -11,7 +13,7 @@ public interface ILocationService { ...@@ -11,7 +13,7 @@ public interface ILocationService {
11 13
12 List<UserLocation> getUserHistory(String deviceCode, String startTime, String endTime); 14 List<UserLocation> getUserHistory(String deviceCode, String startTime, String endTime);
13 15
14 List<UserBaseInfo> getAllUser(String userName); 16 Map<String,Object> getAllUser(QueryParams queryParams);
15 17
16 18
17 } 19 }
......
fm-product/src/main/java/com/skua/modules/location/service/impl/BkyhLocationServiceImpl.java
...@@ -6,6 +6,7 @@ import com.skua.modules.location.entity.*; ...@@ -6,6 +6,7 @@ import com.skua.modules.location.entity.*;
6 import com.skua.modules.location.service.ILocationService; 6 import com.skua.modules.location.service.ILocationService;
7 import com.skua.modules.location.util.ChangeLocationUtils; 7 import com.skua.modules.location.util.ChangeLocationUtils;
8 import com.skua.modules.location.util.MD5Util; 8 import com.skua.modules.location.util.MD5Util;
9 import com.skua.modules.location.vo.QueryParams;
9 import org.apache.commons.lang.StringUtils; 10 import org.apache.commons.lang.StringUtils;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 12
...@@ -108,8 +109,9 @@ public class BkyhLocationServiceImpl implements ILocationService { ...@@ -108,8 +109,9 @@ public class BkyhLocationServiceImpl implements ILocationService {
108 } 109 }
109 110
110 @Override 111 @Override
111 public List<UserBaseInfo> getAllUser(String userName) { 112 public Map<String,Object> getAllUser(QueryParams queryParams) {
112 List<UserBaseInfo> list = new ArrayList<>(); 113 List<UserBaseInfo> list = new ArrayList<>();
114 Map<String,Object> map = new HashMap<>();
113 String post = getBuildingAllInfo(); 115 String post = getBuildingAllInfo();
114 JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString()); 116 JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
115 List<UserBaseInfoBkyhResult> userList = JSONObject.parseArray(json.get("devices").toString(), UserBaseInfoBkyhResult.class); 117 List<UserBaseInfoBkyhResult> userList = JSONObject.parseArray(json.get("devices").toString(), UserBaseInfoBkyhResult.class);
...@@ -131,7 +133,8 @@ public class BkyhLocationServiceImpl implements ILocationService { ...@@ -131,7 +133,8 @@ public class BkyhLocationServiceImpl implements ILocationService {
131 userBaseInfo.setUserName(userBaseInfoBkyhResult.getName()); 133 userBaseInfo.setUserName(userBaseInfoBkyhResult.getName());
132 list.add(userBaseInfo); 134 list.add(userBaseInfo);
133 } 135 }
134 return list; 136 map.put("list",list);
137 return map;
135 } 138 }
136 139
137 } 140 }
......
fm-product/src/main/java/com/skua/modules/location/service/impl/YwLocationServiceImpl.java
...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 import com.skua.modules.location.entity.*; 5 import com.skua.modules.location.entity.*;
6 import com.skua.modules.location.service.ILocationService; 6 import com.skua.modules.location.service.ILocationService;
7 import com.skua.modules.location.util.ChangeLocationUtils; 7 import com.skua.modules.location.util.ChangeLocationUtils;
8 import com.skua.modules.location.vo.QueryParams;
8 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
9 10
10 import java.util.ArrayList; 11 import java.util.ArrayList;
...@@ -94,17 +95,19 @@ public class YwLocationServiceImpl implements ILocationService { ...@@ -94,17 +95,19 @@ public class YwLocationServiceImpl implements ILocationService {
94 } 95 }
95 96
96 @Override 97 @Override
97 public List<UserBaseInfo> getAllUser(String userName) { 98 public Map<String,Object> getAllUser(QueryParams queryParams) {
98 List<UserBaseInfo> list = new ArrayList<>(); 99 List<UserBaseInfo> list = new ArrayList<>();
99 HashMap<String,Object> map = new HashMap<>(); 100 Map<String,Object> map = new HashMap<>();
100 map.put("username", username); 101 HashMap<String,Object> pmap = new HashMap<>();
101 map.put("password", password); 102 pmap.put("username", username);
102 map.put("page",1); 103 pmap.put("password", password);
103 map.put("rows",1000); 104 pmap.put("page",1);
104 map.put("emp",userName); 105 pmap.put("rows",1000);
105 String post = HttpUtil.get(url+"open/information/getEmp.do",map); 106 pmap.put("emp",queryParams.getUserName());
107 String post = HttpUtil.get(url+"open/information/getEmp.do",pmap);
106 JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString()); 108 JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
107 List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class); 109 List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class);
110 List<Map> onlineList = getOnLineList();
108 for (UserBaseInfoYwResult userBaseInfoYwResult : userList) { 111 for (UserBaseInfoYwResult userBaseInfoYwResult : userList) {
109 UserBaseInfo userBaseInfo = new UserBaseInfo(); 112 UserBaseInfo userBaseInfo = new UserBaseInfo();
110 userBaseInfo.setDeviceCode(userBaseInfoYwResult.getDeviceno()); 113 userBaseInfo.setDeviceCode(userBaseInfoYwResult.getDeviceno());
...@@ -114,6 +117,19 @@ public class YwLocationServiceImpl implements ILocationService { ...@@ -114,6 +117,19 @@ public class YwLocationServiceImpl implements ILocationService {
114 userBaseInfo.setUserStatus("0"); 117 userBaseInfo.setUserStatus("0");
115 list.add(userBaseInfo); 118 list.add(userBaseInfo);
116 } 119 }
120 map.put("list",list);
121 map.put("onlineCount",onlineList.size());
122 return map;
123 }
124
125 public List<Map> getOnLineList(){
126 List<Map> list = new ArrayList<>();
127 HashMap<String,Object> map = new HashMap<>();
128 map.put("username", username);
129 map.put("password", password);
130 String post = HttpUtil.get(url+"/open/information/getRealInformation.do",map);
131 JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
132 list = JSONObject.parseArray(json.get("list").toString(), Map.class);
117 return list; 133 return list;
118 } 134 }
119 } 135 }
......
fm-product/src/main/java/com/skua/modules/location/vo/QueryParams.java 0 → 100644
1 package com.skua.modules.location.vo;
2
3 import lombok.Data;
4
5 @Data
6 public class QueryParams {
7
8 /**人员名称*/
9 private String userName;
10 /**在线状态*/
11 private String userStatus;
12
13 }
fm-product/src/main/java/com/skua/modules/monitor/service/IFmPgQueryService.java 0 → 100644
1 package com.skua.modules.monitor.service;
2
3 import java.util.List;
4 import java.util.Map;
5
6 /**
7 * PG实时数据查询接口
8 */
9 public interface IFmPgQueryService {
10
11 List<Map<String, Object>> queryFactoryMonitorFromRealTimeData(String factoryId, String fields);
12
13 }
fm-product/src/main/java/com/skua/modules/monitor/service/impl/FmPgQueryServiceImpl.java 0 → 100644
1 package com.skua.modules.monitor.service.impl;
2
3 import com.skua.core.context.SpringContextUtils;
4 import org.apache.commons.lang.StringUtils;
5 import org.springframework.jdbc.core.JdbcTemplate;
6 import org.springframework.stereotype.Service;
7 import com.skua.modules.monitor.service.IFmPgQueryService;
8
9 import java.text.ParseException;
10 import java.text.SimpleDateFormat;
11 import java.util.*;
12
13 /**
14 * 数据指标信息表
15 */
16 @Service
17 public class FmPgQueryServiceImpl implements IFmPgQueryService {
18
19 @Override
20 public List<Map<String, Object>> queryFactoryMonitorFromRealTimeData(String factoryId, String fields) {
21 String[] factoryIdArray = factoryId.split(",");
22 String sqlPart = "";
23 for(String id : factoryIdArray) {
24 sqlPart = sqlPart +",'"+id+"'";
25 }
26 sqlPart = sqlPart.substring(1);
27 JdbcTemplate pgDb = (JdbcTemplate) SpringContextUtils.getBean("pg-db");
28 List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
29 JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
30 List<Map<String, Object>> factoryDesign = masterDB
31 .queryForList("select * from sys_factory_device where factory_id in ("+sqlPart+")");
32 if(factoryDesign==null||factoryDesign.size()==0) {
33 return result;
34 }
35 StringBuilder str = new StringBuilder();
36 String[] fieldsArr = fields.split(",");
37 for (int i = 0; i < fieldsArr.length; ++i){
38 if(!StringUtils.isEmpty(fieldsArr[i])&&!fieldsArr[i].equals("null")) {
39 str.append("'"+fieldsArr[i]+"'").append(",");
40 }
41 }
42 if(fieldsArr.length > 0){
43 str.append("''");
44 }else{
45 return result;
46 }
47 String deviceIds = "";
48 for(Map<String,Object> map: factoryDesign) {
49 deviceIds = deviceIds +",'"+map.get("device_id")+"'";
50 }
51 deviceIds = deviceIds.substring(1);
52
53 Date d=new Date();//获取时间
54 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
55 long todayTimeStemp = gettimeStemp(sdf.format(d)+" 00:00:00","yyyy-MM-dd");
56
57 //获取pg数据库时间，向前推采集频率的三倍时间，做数据容错
58 String sql = "select ts as time,nm as monitorId,v as monitorValue from realtimedata where nm in("+str.toString()+") and factoryname in ("+deviceIds+")";
59 List<Map<String, Object>> monitorList = pgDb.queryForList(sql);
60 Map<String,Object> map = new HashMap<>();
61 if(monitorList.size() > 0){
62 map.put("time",monitorList.get(0).get("time").toString());
63 for (int m = 0; m < monitorList.size(); m++) {
64 if(Long.parseLong(monitorList.get(m).get("time").toString()) > todayTimeStemp){
65 map.put(monitorList.get(m).get("monitorId").toString(),monitorList.get(m).get("monitorValue"));
66 }else{
67 map.put(monitorList.get(m).get("monitorId").toString(),0.00);
68 }
69 }
70 result.add(map);
71 }else{
72 return result;
73 }
74 return result;
75 }
76
77 public static void main(String[] args) {
78 Date d=new Date();//获取时间
79 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
80 System.out.println(gettimeStemp(sdf.format(d)+" 00:00:00","yyyy-MM-dd"));
81 }
82
83 public static long gettimeStemp(String time, String format) {
84 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
85 if (!"".equals(format)) {
86 simpleDateFormat = new SimpleDateFormat(format);
87 }
88 long timeStemp = 0;
89 try {
90 Date date = simpleDateFormat.parse(time);
91 timeStemp = date.getTime();
92 } catch (ParseException e) {
93 e.printStackTrace();
94 }
95 return timeStemp/1000;
96 }
97 }
fm-system/pom.xml
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
57 </exclusion> 57 </exclusion>
58 </exclusions> 58 </exclusions>
59 </dependency> 59 </dependency>
60 <!-- online form -->
61 </dependencies> 60 </dependencies>
62 61
63 <build> 62 <build>
......
fm-system/src/main/resources/application-dev.yml
...@@ -185,3 +185,10 @@ skua : ...@@ -185,3 +185,10 @@ skua :
185 #cas单点登录 185 #cas单点登录
186 cas: 186 cas:
187 prefixUrl: http://cas.example.org:8443/cas 187 prefixUrl: http://cas.example.org:8443/cas
188
189 #微信相关
190 wx:
191 # 公众号
192 app-id: wxbdc5610cc59c1631
193 app-secret: xxxxxxxxxxxxxxxxxxxxxxx
194 redirect-url: https://passport.yhd.com/wechat/callback.do
......
fm-system/src/main/resources/application-prod.yml
...@@ -98,9 +98,9 @@ spring: ...@@ -98,9 +98,9 @@ spring:
98 driver-class-name: com.mysql.jdbc.Driver 98 driver-class-name: com.mysql.jdbc.Driver
99 # 多数据源配置 99 # 多数据源配置
100 pg-db: 100 pg-db:
101 url: jdbc:postgresql://120.24.205.69:10086/postgres?useUnicode=true&characterEncoding=UTF8 101 url: jdbc:postgresql://47.104.99.86:10086/postgres?useUnicode=true&characterEncoding=UTF8
102 username: postgres 102 username: postgres
103 password: server_2021_%Jksc 103 password: JKjnf9713xt
104 driver-class-name: org.postgresql.Driver 104 driver-class-name: org.postgresql.Driver
105 #redis 配置 105 #redis 配置
106 redis: 106 redis:
...@@ -186,3 +186,10 @@ skua : ...@@ -186,3 +186,10 @@ skua :
186 #cas单点登录 186 #cas单点登录
187 cas: 187 cas:
188 prefixUrl: http://cas.example.org:8443/cas 188 prefixUrl: http://cas.example.org:8443/cas
189
190 #微信相关
191 wx:
192 # 公众号
193 app-id: wxbdc5610cc59c1631
194 app-secret: xxxxxxxxxxxxxxxxxxxxxxx
195 redirect-url: https://passport.yhd.com/wechat/callback.do
......
fm-system/src/main/resources/application-what.yml
...@@ -186,3 +186,10 @@ skua : ...@@ -186,3 +186,10 @@ skua :
186 #cas单点登录 186 #cas单点登录
187 cas: 187 cas:
188 prefixUrl: http://cas.example.org:8443/cas 188 prefixUrl: http://cas.example.org:8443/cas
189
190 #微信相关
191 wx:
192 # 公众号
193 app-id: wxbdc5610cc59c1631
194 app-secret: xxxxxxxxxxxxxxxxxxxxxxx
195 redirect-url: https://passport.yhd.com/wechat/callback.do
......
fm-system/src/main/resources/application-yw.yml
...@@ -186,3 +186,9 @@ skua : ...@@ -186,3 +186,9 @@ skua :
186 #cas单点登录 186 #cas单点登录
187 cas: 187 cas:
188 prefixUrl: http://cas.example.org:8443/cas 188 prefixUrl: http://cas.example.org:8443/cas
189 #微信相关
190 wx:
191 # 公众号
192 app-id: wxbdc5610cc59c1631
193 app-secret: xxxxxxxxxxxxxxxxxxxxxxx
194 redirect-url: https://passport.yhd.com/wechat/callback.do
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!