diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java index f7da9d4..cbff8d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java @@ -85,14 +85,14 @@ public class ChiefController { JSONObject jsonObj = JSONUtil.parseObj(response.body()); ThirdUserInfoResponse res = JSONUtil.toBean(jsonObj.get("data").toString(), ThirdUserInfoResponse.class); //政务通获取用户信息接口（可选） - String getInfo = getAllInfo+"?id=" + res.getUserId() + "&appkey=" + appkey; + String getInfo = getAllInfo + "?id=" + res.getUserId() + "&appkey=" + appkey; HttpResponse getMain = HttpRequest.get(getInfo).execute(); if (getMain.getStatus() == 200) { JSONObject dataJson = JSONUtil.parseObj(getMain.body()); ChiefResponse bean = JSONUtil.toBean(dataJson, ChiefResponse.class); //判断几个政务端用户,等待商量结果 //lj 102 其他是100 //要给dept部门id - bean.setToken(singleLoginService.singleLogin(bean.getAccountName(),bean.getName(),null,"02",bean.getMobile())); + bean.setToken(singleLoginService.singleLogin(bean.getAccountName(), bean.getName(), null, "02", bean.getMobile())); return AjaxResult.success(bean); } else { throw new ServiceException("登陆失败"); 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 80f496b..0c6bc63 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 @@ -76,7 +76,7 @@ public class SingleLoginController { @GetMapping("/login") public void login(HttpServletResponse response) throws IOException { //变成参数模式,appid 用于校验提交的来源地址，生产环境会校验，试用环境暂不校验 - String scUrl = "clientUrl=" + URLEncoder.encode(returnUrl, "UTF-8") + "?appid=b40b40e3-f188-4e00-b67a-6ec5701ce02b"; + String scUrl = "clientUrl=" + URLEncoder.encode(returnUrl, "UTF-8") + "?appid=BwAWS8uh"; //加密后的客户端地址 scUrl = Base64.getEncoder().encodeToString(scUrl.getBytes()); //最终跳转地址 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 4297e45..96fbc18 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -64,4 +64,27 @@ spring: #自己客户端地址 returnUrl: http://39.101.188.84:9999/demo/JinJiHu #定时任务更新企业信息和联系人的开启 -isTiming: false \ No newline at end of file +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 + +#企业端单点登陆url +url: http://114.216.202.175:8008/api/usercenter/User/ssoLogin +#企业端用户信息url +infoUrl: http://114.216.202.175:8008/api/usercenter/User/getInfo \ 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 b65c0dd..c345617 100644 --- a/ruoyi-admin/src/main/resources/application-internet.yml +++ b/ruoyi-admin/src/main/resources/application-internet.yml @@ -112,4 +112,9 @@ spring: #自己客户端地址 returnUrl: https://idp.sipac.gov.cn/bms #定时任务更新企业信息和联系人的开启 -isTiming: true \ No newline at end of file +isTiming: true + +#企业端单点登陆url +url: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogin +#企业端用户信息url +infoUrl: https://qytt.sipac.gov.cn/api/usercenter/User/getInfo \ 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 23abee1..8b34650 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -13,24 +13,6 @@ ruoyi: # 验证码类型 math 数字计算 char 字符验证 captchaType: math -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 9041 - servlet: - # 应用的访问路径 - context-path: / - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 - # 日志配置 logging: level: @@ -126,10 +108,6 @@ xss: # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* -#企业端单点登陆url -url: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogin -#企业端用户信息url -infoUrl: https://qytt.sipac.gov.cn/api/usercenter/User/getInfo #企业端退出登录url logoutUrl: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogOut #政务端clientId @@ -144,6 +122,7 @@ getInfoId: https://qyt.sipac.gov.cn/enterprise-gateway/sipsg-enterprise/sys/thir getAllInfo: http://uid.sipac.gov.cn/open/api/identity/data/FindUserById #法人库-企业联络人员（统一社会信用代码）和法人库-法人基本信息（统一社会信用代码）生产环境 enterpriseUrl: http://172.21.10.46/api/invoke - +#自己客户端地址 +returnUrl: https://idp.sipac.gov.cn/bms