diff --git a/pom.xml b/pom.xml index 1afa5b6..cd4202d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.yupi springboot-init 0.0.1-SNAPSHOT - springboot-init + tk-dataSave 11 diff --git a/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java b/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java index 5b804b9..149f0f3 100644 --- a/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java +++ b/src/main/java/com/yupi/springbootinit/aop/LogInterceptor.java @@ -42,8 +42,10 @@ public class LogInterceptor { Object[] args = point.getArgs(); String reqParam = "[" + StringUtils.join(args, ", ") + "]"; // 输出请求日志 - log.info("request start,id: {}, path: {}, ip: {}, params: {}", requestId, url, - httpServletRequest.getRemoteHost(), reqParam); +// log.info("request start,id: {}, path: {}, ip: {}, params: {}", requestId, url, +// httpServletRequest.getRemoteHost(), reqParam); + log.info("request start,id: {}, path: {}, ip: {}", requestId, url, + httpServletRequest.getRemoteHost()); // 执行原方法 Object result = point.proceed(); // 输出响应日志 diff --git a/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java b/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java index 30b0b26..28a46d6 100644 --- a/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java +++ b/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java @@ -88,6 +88,12 @@ public class NewHosts { @ApiModelProperty(value = "租户 Id", example = "1") private Long tenantId; + + /** + * 租户 Id + */ + @ApiModelProperty(value = "租户 Id", example = "1") + private Long userId; /** * 入库人 */ diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index b045995..747ffd4 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -8,9 +8,9 @@ spring: # todo 需替换配置 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ruoyi-vue-pro?rewriteBatchedStatements=true + url: jdbc:mysql://120.26.251.180:3326/new_tkdata?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true username: root - password: 123asd + password: wfn53400 # Redis 配置 # todo 需替换配置 redis: @@ -18,11 +18,12 @@ spring: host: localhost port: 6379 timeout: 5000 + password: Ofl1xafvbJFtQFo rabbitmq: host: localhost port: 5672 - username: guest - password: guest + username: root + password: 123asd listener: simple: acknowledge-mode: manual diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 171f0e9..4bea75a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: name: springboot-init # 默认 dev 环境 profiles: - active: dev + active: prod # 支持 swagger3 mvc: pathmatch: diff --git a/src/main/resources/mapper/CountryInfoMapper.xml b/src/main/resources/mapper/CountryInfoMapper.xml index 6e44ad8..a465c6a 100644 --- a/src/main/resources/mapper/CountryInfoMapper.xml +++ b/src/main/resources/mapper/CountryInfoMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,19 +25,19 @@ select - from country_info + from server_country_info where id = #{id,jdbcType=INTEGER} and country_id = #{countryId,jdbcType=VARCHAR} - delete from country_info + delete from server_country_info where id = #{id,jdbcType=INTEGER} and country_id = #{countryId,jdbcType=VARCHAR} - insert into country_info (country_id, country_group, country_group_name, + insert into server_country_info (country_id, country_group, country_group_name, country_name, `language`, language_name, create_time, creator, update_time, updater) @@ -48,7 +48,7 @@ - insert into country_info + insert into server_country_info country_id, @@ -116,7 +116,7 @@ - update country_info + update server_country_info country_group = #{countryGroup,jdbcType=VARCHAR}, @@ -151,7 +151,7 @@ - update country_info + update server_country_info set country_group = #{countryGroup,jdbcType=VARCHAR}, country_group_name = #{countryGroupName,jdbcType=VARCHAR}, country_name = #{countryName,jdbcType=VARCHAR}, @@ -167,8 +167,8 @@ \ No newline at end of file diff --git a/src/main/resources/mapper/NewHostsMapper.xml b/src/main/resources/mapper/NewHostsMapper.xml index f234072..3f89922 100644 --- a/src/main/resources/mapper/NewHostsMapper.xml +++ b/src/main/resources/mapper/NewHostsMapper.xml @@ -3,7 +3,7 @@ - + @@ -30,17 +30,17 @@ select - from new_hosts + from server_new_hosts where id = #{id,jdbcType=BIGINT} - delete from new_hosts + delete from server_new_hosts where id = #{id,jdbcType=BIGINT} - insert into new_hosts (hosts_id, hosts_level, hosts_coins, + insert into server_new_hosts (hosts_id, hosts_level, hosts_coins, Invitation_type, online_fans,fans, fllowernum, yesterday_coins, country, hosts_kind, tenant_id, creator @@ -52,7 +52,7 @@ - insert into new_hosts + insert into server_new_hosts hosts_id, @@ -144,7 +144,7 @@ - update new_hosts + update server_new_hosts hosts_id = #{hostsId,jdbcType=VARCHAR}, @@ -193,7 +193,7 @@ - update new_hosts + update server_new_hosts set hosts_id = #{hostsId,jdbcType=VARCHAR}, hosts_level = #{hostsLevel,jdbcType=VARCHAR}, hosts_coins = #{hostsCoins,jdbcType=INTEGER}, @@ -212,15 +212,15 @@ - insert into new_hosts + insert into server_new_hosts (hosts_id, hosts_level, hosts_coins, Invitation_type, online_fans,fans, fllowernum, yesterday_coins, - country, hosts_kind, tenant_id, creator) + country, hosts_kind, tenant_id, creator, user_id) values (#{item.hostsId,jdbcType=VARCHAR}, #{item.hostsLevel,jdbcType=VARCHAR}, #{item.hostsCoins,jdbcType=INTEGER}, #{item.invitationType,jdbcType=INTEGER}, #{item.onlineFans,jdbcType=INTEGER},#{item.fans,jdbcType=INTEGER}, #{item.fllowernum,jdbcType=INTEGER}, #{item.yesterdayCoins,jdbcType=INTEGER}, #{item.country,jdbcType=VARCHAR}, - #{item.hostsKind,jdbcType=VARCHAR}, #{item.tenantId,jdbcType=BIGINT}, #{item.creator,jdbcType=INTEGER}) + #{item.hostsKind,jdbcType=VARCHAR}, #{item.tenantId,jdbcType=BIGINT}, #{item.creator,jdbcType=INTEGER},#{item.userId,jdbcType=BIGINT}) \ No newline at end of file