From bda277e690fb64afcf497fc37ee9d238a48f43df Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Tue, 10 Jun 2025 15:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=85=A5=E9=A9=BB=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gysl/controller/EnterpriseController.java | 20 ++++- .../main/resources/application-internet.yml | 2 +- .../src/main/resources/application-test.yml | 89 +++++++++++++++++++ 3 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/application-test.yml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java index e4ca703..0a2d44c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/EnterpriseController.java @@ -12,11 +12,13 @@ import com.ruoyi.gysl.login.util.HttpGetDataUtil; import com.ruoyi.gysl.service.EnterpriseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -33,6 +35,11 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/gysl/enterprise") public class EnterpriseController extends BaseController { + + + @Value("${isZs}") + private Boolean isZs; + /** * 服务对象 */ @@ -114,10 +121,15 @@ public class EnterpriseController extends BaseController { //=============为将要导入的企业补充信息 pl.forEach(x -> { try { - Enterprise enterpriseData = httpGetDataUtil.getEnterpriseData(x.getTyshxydm()); - if (enterpriseData != null) { - enterpriseData.setXmId(xmId); - enterpriseService.save(enterpriseData); + if(isZs){ + Enterprise enterpriseData = httpGetDataUtil.getEnterpriseData(x.getTyshxydm()); + if (enterpriseData != null) { + enterpriseData.setXmId(xmId); + enterpriseService.save(enterpriseData); + } + }else { + x.setXmId(xmId); + enterpriseService.save(x); } } catch (Exception e) { throw new RuntimeException(e); diff --git a/ruoyi-admin/src/main/resources/application-internet.yml b/ruoyi-admin/src/main/resources/application-internet.yml index 45634af..9918289 100644 --- a/ruoyi-admin/src/main/resources/application-internet.yml +++ b/ruoyi-admin/src/main/resources/application-internet.yml @@ -34,7 +34,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.114.0.18/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.114.0.18:3306/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: GyslMysql@1234 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml new file mode 100644 index 0000000..1897d99 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -0,0 +1,89 @@ +# 项目相关配置 +ruoyi: + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + profile: D:/ruoyi/uploadPath +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://36.213.9.3:3307/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: Jichuang@250603 + # 从库数据源 + 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: + # 地址 + host: localhost + # 端口，默认为6379 + port: 6379 + # 密码 + password: +# 是否是正式环境 +isZs: false + + +#企业端单点登陆url +url: http://114.216.202.175:8008/api/usercenter/User/ssoLogin +#企业端用户信息url +infoUrl: http://114.216.202.175:8008/api/usercenter/User/getInfo +#企业端退出登录url +logoutUrl: http://114.216.202.175:8008/api/usercenter/User/ssoLogOut +#企业端正式环境应用系统编号 +enterpriseAppId: 193d64ab-316e-11f0-b7ab-9c5c8e847e61 +# 应用私钥 +enterpriseAppsecret: 7C21B5B9316E11F0B7AB9C5C8E847E61 +#自己客户端地址 +#returnUrl: http://192.168.0.119:80 +returnUrl: http://36.213.9.3:81/gysl/index.html