From b191d6140b2c66d5f2b788a3d48f9b5e7e9e01be Mon Sep 17 00:00:00 2001 From: wu Date: Fri, 26 Jul 2024 17:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BmsEnterpriseBasicInfoMapper.java | 17 +- .../declaration/regular/SmsEnterChange.java | 3 +- .../controller/SingleLoginController.java | 79 ++++--- .../single/service/SingleLoginService.java | 16 +- .../service/impl/SingleLoginServiceImpl.java | 45 +--- .../src/main/resources/application-druid.yml | 156 ++++++------- .../main/resources/application-internet.yml | 206 +++++++++--------- .../src/main/resources/application.yml | 2 +- .../BmsEnterpriseBasicInfoMapper.xml | 6 + 9 files changed, 266 insertions(+), 264 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java index c2124a6..bdbed6c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java @@ -10,18 +10,18 @@ import java.util.List; /** * 企业基础信息Mapper接口 - * + * * @author farben * @date 2023-08-25 */ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper { /** * 查询企业基础信息列表 - * + * * @param bmsEnterpriseBasicInfo 企业基础信息 * @return 企业基础信息集合 */ - public Page page(Page page,@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + public Page page(Page page, @Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); /** @@ -30,14 +30,23 @@ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper page(@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + List page(@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); /** * 作业台查询企业信息 */ List workSearch(@Param("req") EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); + /** * 根据信用代码获取该企业id */ BmsEnterpriseBasicInfo selectGetCreditCode(String getCreditCode); + + /** + * 根据企业信用代码查询 + * + * @param uscc 企业信用代码 + * @return 企业信息 + */ + BmsEnterpriseBasicInfo findByQytyxydm(@Param("uscc") String uscc); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java index 30dc96c..e8b2708 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java @@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; @@ -35,7 +34,7 @@ public class SmsEnterChange { @Value("${isTiming}") private Boolean isTiming; // 每三小时执行一次 - @Scheduled(cron = "0 0 */3 * * *") + @Scheduled(cron = "0 0 */12 * * *") private void runTask() { if(isTiming){ //查询初审的所有用户 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/SingleLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/SingleLoginController.java index 32ef58b..391c841 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/SingleLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/SingleLoginController.java @@ -5,11 +5,11 @@ package com.ruoyi.jjh.declaration.single.controller; * @since 2024/5/22 15:50 */ +import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; @@ -32,7 +32,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Base64; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -44,14 +47,13 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/system/singlelogin") public class SingleLoginController { private static final Logger log = LoggerFactory.getLogger(SingleLoginController.class); + @Value("${url}") private String url; - @Value("${infoUrl}") private String infoUrl; - @Value("${logoutUrl}") private String logoutUrl; @@ -69,16 +71,17 @@ public class SingleLoginController { @Value("${enterpriseAppId}") private String enterpriseAppId; + @Value("${enterpriseAppsecret}") + private String enterpriseAppsecret; + /** * 统一登陆 - * - * @return */ @ApiOperation("统一登陆") @GetMapping("/login") public void login(HttpServletResponse response) throws IOException { //变成参数模式,appid 用于校验提交的来源地址，生产环境会校验，试用环境暂不校验 - String scUrl = "clientUrl=" + URLEncoder.encode(returnUrl, "UTF-8") + "?appid="+enterpriseAppId; + String scUrl = "clientUrl=" + URLEncoder.encode(returnUrl, "UTF-8") + "?appid=" + enterpriseAppId; //加密后的客户端地址 scUrl = Base64.getEncoder().encodeToString(scUrl.getBytes()); //最终跳转地址 @@ -86,10 +89,6 @@ public class SingleLoginController { // 添加请求头 response.setHeader("Content-Type", "application/json"); response.setHeader("X-Requested-With", "XMLHttpRequest"); -// Map stringStringMap = singleLoginService.generationHeader(); -// response.setHeader("time",stringStringMap.get("time")); -// response.setHeader("appid",stringStringMap.get("appid")); -// response.setHeader("sign",stringStringMap.get("sign")); response.sendRedirect(jumpurl); } @@ -97,16 +96,16 @@ public class SingleLoginController { /** * 获取用户信息 * - * @return + * @return 用户信息 */ - @ApiOperation(value = "获取用户信息",response = UserResponse.class) + @ApiOperation(value = "获取用户信息", response = UserResponse.class) @GetMapping("/getInfo") - public AjaxResult getInfo(@RequestParam("clientToken") String clientToken) throws Exception { - String url = infoUrl + "?clienttoken=" + clientToken; - HttpResponse response = HttpUtil.createGet(url) -// .addHeaders(singleLoginService.generationHeader()) + public AjaxResult getInfo(String clientToken) throws Exception { + HttpResponse response = HttpUtil.createGet(infoUrl) + .form("clienttoken", clientToken) +// .addHeaders(generationHeader()) .execute(); - String responseBody = null; + String responseBody; // 获取响应状态码 int statusCode = response.getStatus(); if (statusCode == 200) { @@ -119,30 +118,28 @@ public class SingleLoginController { // 将用户信息存储到Redis中 String key = "user:" + clientToken; //判断是法人用户 - if("ep".equals(dataObj.get("usertype"))){ + if ("ep".equals(dataObj.get("usertype"))) { JSONObject mainobj = dataObj.getJSONObject("mainbody"); UserResponse res = JSONUtil.toBean(dataObj, UserResponse.class); UserMainResponse req = JSONUtil.toBean(mainobj, UserMainResponse.class); //如果在企业库里面找不到该企业就返回错误 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tyshxydm", req.getUscc()); - BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = bmsEnterpriseBasicInfoMapper.selectOne(queryWrapper); + BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = bmsEnterpriseBasicInfoMapper.findByQytyxydm(req.getUscc()); Long id; if (bmsEnterpriseBasicInfo == null) { throw new ServiceException("该企业不在库!请稍后再试!"); - }else { + } else { id = bmsEnterpriseBasicInfo.getId(); } // 设置过期时间为8小时 - String token = singleLoginService.singleLogin(req.getUscc(),req.getEpname(),id,"01",null); + String token = singleLoginService.singleLogin(req.getUscc(), req.getEpname(), id, "01", null); res.setToken(token); res.setMain(req); redisCache.setCacheObject(key, res, expirationSeconds, TimeUnit.MINUTES); return AjaxResult.success(res); - }else { + } else { log.error(response.body()); - throw new ServiceException("未知异常请联系管理员"); + throw new ServiceException("该用户不是企业法人"); } } else { log.error(response.body()); @@ -150,24 +147,44 @@ public class SingleLoginController { } } - + /** + * 退出登录 + * + * @param clienttoken clienttoken + * @return 响应类 + */ @ApiOperation(value = "退出登录") @GetMapping("/enterpriseLogout") - public AjaxResult enterpriseLogout(@RequestParam("clienttoken") String clienttoken) { + public AjaxResult enterpriseLogout(@RequestParam("clienttoken") String clienttoken) { String url = logoutUrl + "?clienttoken=" + clienttoken; HttpResponse execute = HttpUtil.createGet(url) -// .addHeaders(singleLoginService.generationHeader()) +// .addHeaders(generationHeader()) .execute(); String str; // 获取响应状态码 int statusCode = execute.getStatus(); - if(statusCode==200){ + if (statusCode == 200) { str = "退出成功"; - }else { + } else { str = "退出失败"; } return AjaxResult.success(str); } - + /** + * 正式环境需要的请求头 + * + * @return 请求头 + */ + private Map generationHeader() { + // 定义时间格式化器 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); + String format = LocalDateTime.now().format(formatter); + //正式端需要请求头 + HashMap headers = new HashMap<>();//存放请求头，可以存放多个请求头 + headers.put("appid", enterpriseAppId); + headers.put("time", format); + headers.put("sign", DigestUtil.md5Hex(enterpriseAppId + enterpriseAppsecret + format)); + return headers; + } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/SingleLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/SingleLoginService.java index 708754f..81e8e94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/SingleLoginService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/SingleLoginService.java @@ -1,22 +1,16 @@ package com.ruoyi.jjh.declaration.single.service; -import java.util.Map; - /** * 用户验证 + * * @author du * @since 2024/6/4 15:16 */ public interface SingleLoginService { - /** - * 保存用户信息 换取本系统token - */ - String singleLogin(String userName,String nickName,Long id,String userType,String phone); + /** + * 保存用户信息 换取本系统token + */ + String singleLogin(String userName, String nickName, Long id, String userType, String phone); - /** - * 正式环境需要的请求头 - * @return - */ - Map generationHeader(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java index ed63d7b..5f5848b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java @@ -1,8 +1,5 @@ package com.ruoyi.jjh.declaration.single.service.impl; -import cn.hutool.core.codec.Base64; -import cn.hutool.crypto.digest.DigestUtil; -import cn.hutool.json.JSONUtil; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; @@ -15,7 +12,6 @@ import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.security.context.AuthenticationContextHolder; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.jjh.declaration.single.service.SingleLoginService; -import com.ruoyi.jjh.declaration.single.util.HMAC256Config; import com.ruoyi.jjh.ent.service.SmsAlertsService; import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Value; @@ -26,9 +22,6 @@ import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.HashMap; import java.util.Map; /** @@ -53,14 +46,11 @@ public class SingleLoginServiceImpl implements SingleLoginService { @Value("${isTiming}") private Boolean isTiming; - @Value("${enterpriseAppId}") - private String enterpriseAppId; - /** * 保存用户信息 换取本系统token */ @Override - public String singleLogin(String userName, String nickName, Long id, String userType,String phone) { + public String singleLogin(String userName, String nickName, Long id, String userType, String phone) { // 用户验证 Authentication authentication; try { @@ -70,11 +60,11 @@ public class SingleLoginServiceImpl implements SingleLoginService { user.setPassword("admin123"); user.setPhonenumber(phone); Long[] roles = new Long[1]; - if("01".equals(userType)){ - roles[0]=101L; - }else if("02".equals(userType)){ + if ("01".equals(userType)) { + roles[0] = 101L; + } else if ("02".equals(userType)) { //在这里可以判断具体要给什么权限 要给dept部门id - roles[0]=102L; + roles[0] = 102L; user.setDeptId(100L); user.setZwuser(userName); } @@ -83,12 +73,11 @@ public class SingleLoginServiceImpl implements SingleLoginService { user.setUserType(userType); user.setEnterpriseId(id); //如果用户名也就是信用代码没有重复的就新增用户 - if (userService.checkUserNameUnique(user)) - { + if (userService.checkUserNameUnique(user)) { user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); userService.insertUser(user); - if("02".equals(userType)&isTiming){ - if(user.getPhonenumber()!=null){ + if ("02".equals(userType) & isTiming) { + if (user.getPhonenumber() != null) { smsAlertsService.addSsmPhone(user.getPhonenumber()); } } @@ -116,23 +105,5 @@ public class SingleLoginServiceImpl implements SingleLoginService { return String.valueOf(token.get("access_token")); } - - /** - * 正式环境需要的请求头 - * @return - */ - @Override - public Map generationHeader() { - // 定义时间格式化器 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); - String format = LocalDateTime.now().format(formatter); - //正式端需要请求头 - HashMap headers = new HashMap<>();//存放请求头，可以存放多个请求头 - headers.put("appid", enterpriseAppId); - headers.put("time", format); - headers.put("sign", DigestUtil.md5Hex(enterpriseAppId+"03f71c58-39e9-11ef-bbd6-fa163e2b2e10"+format)); - return headers; - } - } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index fc1e709..a6a164c 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -1,66 +1,66 @@ # 数据源配置 spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - # 主库数据源 - master: -# url: jdbc:mysql://localhost:3306/jingji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:mysql://39.101.188.84:3307/jingji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root -# password: root - password: Admin123@ - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置连接超时时间 - connectTimeout: 30000 - # 配置网络超时时间 - socketTimeout: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + # url: jdbc:mysql://localhost:3306/jingji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://39.101.188.84:3307/jingji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + # password: root + password: Admin123@ + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true #自己客户端地址 returnUrl: http://39.101.188.84:9999/demo/JinJiHu #returnUrl: http://192.168.0.111:80 @@ -69,24 +69,26 @@ isTiming: false # 开发环境配置 server: - # 服务器的HTTP端口，默认为8080 - port: 9040 - servlet: - # 应用的访问路径 - context-path: / - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 + # 服务器的HTTP端口，默认为8080 + port: 9040 + servlet: + # 应用的访问路径 + context-path: / + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # 连接数满后的排队数，默认为100 + accept-count: 1000 + threads: + # tomcat最大线程数，默认为200 + max: 800 + # Tomcat启动初始化的线程数，默认值10 + min-spare: 100 #企业端测试环境应用系统编号 enterpriseAppId: BwAWS8uh +# 应用私钥 +enterpriseAppsecret: 03f70874-39e9-11ef-bbd6-fa163e2b2e10 #企业端单点登陆url url: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogin #企业端用户信息url @@ -102,7 +104,7 @@ paramType: cs smsV: oVFPU1y1wYJIatvqrGoTAE5ycguUyjaY #工单编号 code: SC24071600001 -#PaaSID +#短信PaaSID paaSID: xdfwy #短信token smsToken: iM89cd4b0cGNVYAqKu7jl7EONyHgTa0N \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-internet.yml b/ruoyi-admin/src/main/resources/application-internet.yml index 8099fce..02ad453 100644 --- a/ruoyi-admin/src/main/resources/application-internet.yml +++ b/ruoyi-admin/src/main/resources/application-internet.yml @@ -1,114 +1,114 @@ # 项目相关配置 ruoyi: - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: /home/ruoyi/uploadPath + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: /home/ruoyi/uploadPath # 正式环境配置 server: - # 服务器的HTTP端口，默认为8080 - port: 8910 - servlet: - # 应用的访问路径 - context-path: /api - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 + # 服务器的HTTP端口，默认为8080 + port: 8910 + servlet: + # 应用的访问路径 + context-path: /api + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # 连接数满后的排队数，默认为100 + accept-count: 1000 + threads: + # tomcat最大线程数，默认为200 + max: 800 + # Tomcat启动初始化的线程数，默认值10 + min-spare: 100 # 日志配置 logging: - level: - com.ruoyi: error - org.springframework: error + level: + com.ruoyi: error + org.springframework: error # 数据源配置 spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - # 主库数据源 - master: - url: jdbc:mysql://192.114.0.247:3306/jinji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: Cloud@1234 - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置连接超时时间 - connectTimeout: 30000 - # 配置网络超时时间 - socketTimeout: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - # redis 配置 - redis: - # 地址 - host: 192.114.0.247 - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 - # 密码 + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://192.114.0.247:3306/jinji_hu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root password: Cloud@1234 - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + # redis 配置 + redis: + # 地址 + host: 192.114.0.247 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # 密码 + password: Cloud@1234 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms #自己客户端地址 returnUrl: https://idp.sipac.gov.cn/bms #定时任务更新企业信息和联系人的开启 @@ -116,10 +116,14 @@ isTiming: true #企业端正式环境应用系统编号 enterpriseAppId: 03f70874-39e9-11ef-bbd6-fa163e2b2e10 +# 应用私钥 +enterpriseAppsecret: 03f70874-39e9-11ef-bbd6-fa163e2b2e10 #企业端单点登陆url url: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogin +#url: http://114.216.202.175:8008/api/usercenter/User/ssoLogin #企业端用户信息url infoUrl: https://qytt.sipac.gov.cn/api/usercenter/User/getInfo +#infoUrl: http://114.216.202.175:8008/api/usercenter/User/getInfo #短信发送接口 smsSend: http://zwyyone.sipac.gov.cn/ebus/szyqznzs/dx @@ -131,7 +135,7 @@ paramType: zs smsV: 3b3jaDmYcf87Mk7NqEmzis=3AaaFeYmV4DIf #工单编号 code: SC24071600001 -#PaaSID +#短信PaaSID paaSID: xdfwy #短信token smsToken: iM89cd4b0cGNVYAqKu7jl7EONyHgTa0N \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 663ce31..28028f1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -34,7 +34,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: internet # 文件上传 servlet: multipart: diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml index 76b2dc5..17fdfa1 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml @@ -31,4 +31,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file