diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java index 003d9f6..9ca29eb 100644 --- a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java +++ b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java @@ -82,9 +82,9 @@ public class OpenAlipayController extends BaseController { String key = "setting:register:" + getTenantId(); String setting = redisUtil.get(key); - if (setting == null) { - throw new BusinessException("请先配置注册设置"); - } +// if (setting == null) { +// throw new BusinessException("请先配置注册设置"); +// } JSONObject jsonObject = JSONObject.parseObject(setting); String roleId = jsonObject.getString("roleId"); // 实例化客户端 @@ -141,7 +141,7 @@ public class OpenAlipayController extends BaseController { UserRole userRole = new UserRole(); userRole.setUserId(user.getUserId()); userRole.setTenantId(param.getTenantId()); - userRole.setRoleId(Integer.valueOf(roleId)); + userRole.setRoleId(Integer.valueOf(81)); userRoleService.save(userRole); // 添加第三方用户信息 UserOauth userOauth2 = new UserOauth(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 719f341..4b46b37 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,6 +9,12 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource +# 日志配置 +logging: + level: + com.gxwebsoft: DEBUG + com.baomidou.mybatisplus: DEBUG + socketio: host: localhost #IP地址 @@ -25,16 +31,3 @@ config: bucketName: oss-yunxinwei bucketDomain: https://oss.wsdns.cn aliyunDomain: https://oss-yunxinwei.oss-cn-shenzhen.aliyuncs.com - -# 日志配置 -logging: - level: - root: INFO - com.gxwebsoft: INFO - com.baomidou.mybatisplus: INFO - file: - name: yxw.log - logback: - rollingpolicy: -# file-name-pattern: - max-history: 30 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index c7493db..5ffa03d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -3,35 +3,28 @@ # 数据源配置 spring: datasource: - url: jdbc:mysql://47.119.165.234:3308/open_ws?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 - username: open_ws - password: DzAmFiZfPJ6ZGApm + url: jdbc:mysql://1.14.159.185:3318/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: yunxinwei + password: A56sK6aW2FA3wBy2 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource # 日志配置 logging: file: - name: logs/websoft-api.log + name: websoft-api.log level: - root: INFO - com.gxwebsoft: INFO + root: WARN + com.gxwebsoft: ERROR com.baomidou.mybatisplus: ERROR - com.alipay.api: INFO - logback: - rollingpolicy: -# file-name-pattern: ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log - max-history: 30 socketio: host: 0.0.0.0 #IP地址 -# host: localhost # 框架配置 config: # 生产环境接口 server-url: https://yxw.wsdns.cn/api -# server-url: https://127.0.0.1:9090/api upload-path: /www/wwwroot/file.ws/ # 阿里云OSS云存储 @@ -41,9 +34,3 @@ config: bucketName: oss-yunxinwei bucketDomain: https://oss.wsdns.cn aliyunDomain: https://oss-yunxinwei.oss-cn-shenzhen.aliyuncs.com - -#定时表达式 -cron: - alert: 0 30 9 * * ? - profit: 0 0/2 * * * ? - timeoutOrder: 1 0 0 * * ?