diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/java/com/zdxt/RuoYiApplication.java b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/java/com/zdxt/RuoYiApplication.java index 2bf029ae..2c67a7d1 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/java/com/zdxt/RuoYiApplication.java +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/java/com/zdxt/RuoYiApplication.java @@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -13,6 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * @author ruoyi */ @Slf4j +@EnableConfigurationProperties @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @MapperScan(value = {"com.zdxt.**.mapper"}) @EnableTransactionManagement diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml index 5fe1fdad..3f847b46 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/pom.xml @@ -53,6 +53,11 @@ 1.0 compile + + org.springframework.boot + spring-boot-configuration-processor + true + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatProperties.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatProperties.java new file mode 100644 index 00000000..18c44a2f --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatProperties.java @@ -0,0 +1,49 @@ +package com.zdxt.knowledge.domain; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "wechat.config") +public class WechatProperties { + + private String appId; + + private String secret; + + private String grantType; + + private String requestUrl; + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getSecret() { + return secret; + } + + public void setSecret(String secret) { + this.secret = secret; + } + + public String getGrantType() { + return grantType; + } + + public void setGrantType(String grantType) { + this.grantType = grantType; + } + + public String getRequestUrl() { + return requestUrl; + } + + public void setRequestUrl(String requestUrl) { + this.requestUrl = requestUrl; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java index 63e5e1cc..1bde8879 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java @@ -24,6 +24,7 @@ import com.zdxt.common.zdxtFile.ZdxtFileCommon; import com.zdxt.knowledge.domain.LocalFileMultipartFile; import com.zdxt.knowledge.domain.SceneImportDataModel; import com.zdxt.knowledge.domain.SceneManage; +import com.zdxt.knowledge.domain.WechatProperties; import com.zdxt.knowledge.mapper.SceneManageMapper; import com.zdxt.knowledge.service.ISceneManageService; import com.zdxt.knowledge.utils.ExcelUtil; @@ -69,9 +70,8 @@ public class SceneManageServiceImpl implements ISceneManageService { @Autowired private ZdxtFileCommonApi zdxtFileCommonApi; - private static final String APPID = "wx93ec514a5c456507"; - - private static final String SECRET = "f5a3f295dbee3cc1c2f73b9a324c2eb2"; + @Autowired + private WechatProperties wechatProperties; /** * 查询【请填写功能名称】 @@ -112,25 +112,26 @@ public class SceneManageServiceImpl implements ISceneManageService { @Override public ZDResponse getQRCode() throws Exception { + String appId = wechatProperties.getAppId(); ZdxtFileBean zdxtFileBean = new ZdxtFileBean(); - zdxtFileBean.setBusinessId(APPID); + zdxtFileBean.setBusinessId(appId); List zdxtFileBeans = zdxtFileCommonApi.selectZdxtFileList(zdxtFileBean); if (CollectionUtils.isEmpty(zdxtFileBeans)) { - InputStream inputStream = generateQRCode(APPID); + InputStream inputStream = generateQRCode(appId); //存入本地数据库 File file = File.createTempFile("temp", ".png"); FileUtils.copyInputStreamToFile(inputStream, file); MultipartFile multipartFile = new LocalFileMultipartFile(file); String uploadPath = fileUploadApi.upload(multipartFile); - zdxtFileCommonApi.deleteZdxtFileByIds(APPID); + zdxtFileCommonApi.deleteZdxtFileByIds(appId); //zdxtFileCommonApi.insertZdxtFile(multipartFile, APPID, uploadPath); ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon(); zdxtFileCommon.setUploadPersonId("0000"); zdxtFileCommon.setUploadPersonName("System"); zdxtFileCommon.setUploadPath(uploadPath); zdxtFileCommon.setGuid(StringUtils.getUUID()); - zdxtFileCommon.setBusinessId(APPID); - zdxtFileCommonApi.insertZdxtFileToApp(multipartFile,zdxtFileCommon); + zdxtFileCommon.setBusinessId(appId); + zdxtFileCommonApi.insertZdxtFileToApp(multipartFile, zdxtFileCommon); file.deleteOnExit(); return ZDResponse.success("成功", uploadPath); } @@ -203,8 +204,8 @@ public class SceneManageServiceImpl implements ISceneManageService { } public String getAccessToken() { - String appid = APPID; - String secret = SECRET; + String appid = wechatProperties.getAppId(); + String secret = wechatProperties.getSecret(); String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret; String result = HttpUtil.get(url); JSONObject jsonObject = JSONUtil.parseObj(result); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java index 8f0fcde1..30d7a893 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java @@ -6,10 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.zdxt.common.ZDResponse; import com.zdxt.common.util.Convert; import com.zdxt.common.util.StringUtils; -import com.zdxt.knowledge.domain.RawDataDO; -import com.zdxt.knowledge.domain.SceneMedal; -import com.zdxt.knowledge.domain.WechatLoginRequest; -import com.zdxt.knowledge.domain.WechatUser; +import com.zdxt.knowledge.domain.*; import com.zdxt.knowledge.mapper.SceneMedalMapper; import com.zdxt.knowledge.mapper.WechatLoginMapper; import com.zdxt.knowledge.service.WechatService; @@ -44,10 +41,8 @@ public class WechatServiceImpl implements WechatService { @Autowired private SceneMedalMapper sceneMedalMapper; - private static final String REQUEST_URL = "https://api.weixin.qq.com/sns/jscode2session"; - private static final String APPID = "wx93ec514a5c456507"; - private static final String SECRET = "f5a3f295dbee3cc1c2f73b9a324c2eb2"; - private static final String GRANT_TYPE = "authorization_code"; + @Autowired + private WechatProperties wechatProperties; @Override @@ -110,7 +105,7 @@ public class WechatServiceImpl implements WechatService { userInfoMap.put("userId", insertOrUpdateDO.getGuid()); } else { userInfoMap.put("token", openId); - userInfoMap.put("userId", insertOrUpdateDO.getGuid()); + userInfoMap.put("userId", user.getGuid()); // 已存在，做已存在的处理，如更新用户的头像，昵称等，根据openID更新 //wechatLoginMapper.updateByOpenId(insertOrUpdateDO); } @@ -143,20 +138,20 @@ public class WechatServiceImpl implements WechatService { Map requestUrlParam = new HashMap<>(); // 小程序appId - requestUrlParam.put("appid", APPID); + requestUrlParam.put("appid", wechatProperties.getAppId()); // 小程序secret - requestUrlParam.put("secret", SECRET); + requestUrlParam.put("secret", wechatProperties.getSecret()); // 小程序端返回的code requestUrlParam.put("js_code", code); // 默认参数 - requestUrlParam.put("grant_type", GRANT_TYPE); + requestUrlParam.put("grant_type", wechatProperties.getGrantType()); // 发送post请求读取调用微信接口获取openid用户唯一标识 - String result = HttpClientUtils.doPost(REQUEST_URL, requestUrlParam); + String result = HttpClientUtils.doPost(wechatProperties.getRequestUrl(), requestUrlParam); return JSON.parseObject(result); } - private WechatUser buildWechatUserAuthInfoDO(WechatLoginRequest loginRequest, String sessionKey, String openId) { + private WechatUser buildWechatUserAuthInfoDO(WechatLoginRequest loginRequest, String openId, String sessionKey) { WechatUser wechatUserDO = new WechatUser(); wechatUserDO.setOpenId(openId); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml index 622ef40d..8325dbce 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml @@ -5,7 +5,6 @@ - @@ -24,7 +23,6 @@ select guid, - token, nickname, avatar_url, gender, @@ -74,7 +72,6 @@ insert into wechat_user guid, - `token`, nickname, avatar_url, gender, @@ -89,7 +86,6 @@ #{guid}, - #{token}, #{nickname}, #{avatarUrl}, #{gender}, @@ -107,7 +103,6 @@ update wechat_user - token = #{token}, nickname = #{nickname}, avatar_url = #{avatarUrl}, gender = #{gender},