pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/webCtrls/WebFileCtrl.java
@@ -1,4 +1,5 @@ package com.dy.pipIrrGlobal.webCtrls; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.pipIrrGlobal.dyFile.FileConstant; pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/config/WebFilterConfiguration.java
New file @@ -0,0 +1,51 @@ package com.dy.pipIrrWebFile.config; import com.dy.common.webFilter.DevOfDataSourceNameSetFilter; import com.dy.common.webFilter.UserTokenFilter; import jakarta.servlet.Filter; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** * @author ZhuBaoMin * @date 2023/12/5 10:32 * @LastEditTime 2023/12/5 10:32 * @Description */ @Configuration public class WebFilterConfiguration { @Value("${pipIrr.global.dev}") public String isDevStage ;//是否为开发阶段 @Value("${pipIrr.global.dsName}") public String dsName ;//开发阶段的数据源名称 /** * DevOfDataSourceNameSetFilter与UserTokenFilter只能一个被配置上， * 所以他们的order都是1 */ private static final int order_UserTokenFilter = 1 ;//与下面 private static final int order_DevOfDataSourceNameSetFilter = 1 ; @Bean public FilterRegistrationBean<? extends Filter> RegFilter() { FilterRegistrationBean<Filter> filterRegistrationBean = new FilterRegistrationBean<>(); if(this.isDevStage != null && !this.isDevStage.trim().equals("") && this.isDevStage.trim().equalsIgnoreCase("true")){ filterRegistrationBean.setFilter(new DevOfDataSourceNameSetFilter()); filterRegistrationBean.addUrlPatterns("/*");//配置过滤规则 filterRegistrationBean.addInitParameter("dataSourceName",dsName);//设置init参数 filterRegistrationBean.setName("DevOfDataSourceNameSetFilter");//设置过滤器名称 filterRegistrationBean.setOrder(order_DevOfDataSourceNameSetFilter);//执行次序 }else{ filterRegistrationBean.setFilter(new UserTokenFilter()); filterRegistrationBean.addUrlPatterns("/*");//配置过滤规则 filterRegistrationBean.setName("UserTokenFilter");//设置过滤器名称 filterRegistrationBean.setOrder(order_UserTokenFilter);//执行次序 } return filterRegistrationBean; } } pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/config/WebListenerConfiguration.java
New file @@ -0,0 +1,34 @@ package com.dy.pipIrrWebFile.config; import com.dy.common.webListener.GenerateIdSetSuffixListener; import jakarta.servlet.ServletContextListener; import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** * @author ZhuBaoMin * @date 2023/12/5 10:33 * @LastEditTime 2023/12/5 10:33 * @Description */ @Configuration public class WebListenerConfiguration { /** * 启动顺序 */ private static final int order_idSetSuffix = 1 ; /** * 内部提供listener，该listener在系统启动时，根据配置 设置ID产生器的后缀 * @return 注册Bean */ @Bean public ServletListenerRegistrationBean<? extends ServletContextListener> regSsoListener() { ServletListenerRegistrationBean<GenerateIdSetSuffixListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>(); listenerRegistrationBean.setListener(new GenerateIdSetSuffixListener()); listenerRegistrationBean.setOrder(order_idSetSuffix); return listenerRegistrationBean; } } pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/PipIrrIrrigateApplication.java
@@ -18,7 +18,7 @@ }) } ) @MapperScan({"com.dy.pipIrrGlobal.daoIr", "com.dy.pipIrrGlobal.daoIr"}) @MapperScan({"com.dy.pipIrrGlobal.daoIr", "com.dy.pipIrrGlobal.daoIr","com.dy.pipIrrGlobal.daoFi"}) public class PipIrrIrrigateApplication { public static void main(String[] args) { pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/PipIrrRemoteApplication.java
@@ -18,7 +18,7 @@ }) } ) @MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa"}) @MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa","com.dy.pipIrrGlobal.daoFi"}) public class PipIrrRemoteApplication { public static void main(String[] args) { pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuLogCtrl.java
@@ -92,7 +92,16 @@ @SsoAop() public BaseResponse<List<String>> rtuLogText(String rtuAddr){ String mwUrlRtuLogText = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw_text); return this.requestMw4Text(rtuAddr, mwUrlRtuLogText) ; BaseResponse<List<String>> text = this.requestMw4Text(rtuAddr, mwUrlRtuLogText); if (text != null){ if (text.getContent().get(0).contains("控制器")){ return BaseResponseUtils.buildErrorMsg(""+text.getContent().get(0)+"") ; } return text ; }else { return BaseResponseUtils.buildErrorMsg("获取日志文件为null") ; } // return this.requestMw4Text(rtuAddr, mwUrlRtuLogText) ; }
@@ -27,7 +27,7 @@ }) } ) @MapperScan({"com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoRm"}) @MapperScan({"com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoRm","com.dy.pipIrrGlobal.daoFi"}) public class PipIrrSellApplication { public static void main(String[] args) { pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java
@@ -21,7 +21,7 @@ }) } ) @MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa"}) @MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoFi"}) @Slf4j public class PipIrrSsoApplication {
@@ -22,7 +22,8 @@ "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoSt"}) "com.dy.pipIrrGlobal.daoSt", "com.dy.pipIrrGlobal.daoFi"}) public class PipIrrStatisticsApplication { public static void main(String[] args) { pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
@@ -191,7 +191,7 @@ String sessionKey = job.getString("session_key"); Long clientId = clientSv.getClientIdByPhone(phoneNumber); String SessionId = ""; String sessionId = ""; if(clientId != null) { // 添加微信用户账户记录 SeOpenId seOpenId = new SeOpenId(); @@ -202,9 +202,13 @@ //Long SessionId = clientSv.addOpenId(seOpenId); Long rec = clientSv.addOpenId(seOpenId); if(rec != null) { SessionId = String.valueOf(rec); sessionId = String.valueOf(rec); } return BaseResponseUtils.buildSuccess(SessionId); JSONObject job_result = new JSONObject(); job_result.put("clientId", clientId); job_result.put("sessionId", sessionId); return BaseResponseUtils.buildSuccess(job_result); } else { return BaseResponseUtils.buildErrorMsg(WechatResultCode.PHONE_NUMBER_IS_ERROR.getMessage());
