From cc5867d99e426da0fdcad1d35a52cfd20ab7db89 Mon Sep 17 00:00:00 2001 From: cuibaocheng Date: Fri, 11 Sep 2020 17:26:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B4=94=E5=AE=9D=E9=93=96=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/NewsContentServiceImpl.java | 2 +- src/main/resources/application.yml | 52 +++++++++++++++---- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cm/news/service/newscontent/impl/NewsContentServiceImpl.java b/src/main/java/com/cm/news/service/newscontent/impl/NewsContentServiceImpl.java index 4622571..9bac425 100644 --- a/src/main/java/com/cm/news/service/newscontent/impl/NewsContentServiceImpl.java +++ b/src/main/java/com/cm/news/service/newscontent/impl/NewsContentServiceImpl.java @@ -389,7 +389,7 @@ public class NewsContentServiceImpl extends BaseService implements INewsContentS // 第二步 查找配置的标签项 List configList = iNewsLabelConfigService.getNewsLabelConfigByNewsContentId(appDTO.getNewsContentId()); appDTO.setNewsContentLabelList(configList); - // 第三步 是否收藏 + // 第三步 是否收藏 if(!StringUtil.isEmpty(userId)) { NewsContentCollectDTO likeDTO = iNewsContentCollectService.getNewsContentCollectByNewsContentIdAndUserId(userId, appDTO.getNewsContentId()); if(likeDTO == null) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d53ee05..3be270f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,8 +1,38 @@ +# 访问其他项目 +template: + titile: 模板项目 + creatTemplate-url: http://192.168.0.111:8081/template/resource/template/creattemplaterelease + +# 智慧网闸配置 +net-management: + config-path: D:\\net_manager_libs\\ + so-path: D:\\net_manager_libs\\ + news: - nginxAddress: http://192.168.0.104/ # Nginx地址 + nginxAddress: http://192.168.0.115:8089/ # Nginx地址 mainServerAddress: # 门户服务器地址 - serverAddress: http://192.168.0.104:8082/news/ # 新闻服务器地址 - + serverAddress: http://192.168.0.115:8082/news/ # 新闻服务器地址 + +socket: + central-control: + # 是否激活 + active: false + client: + client-id: f8190a1a94354105b3748ad3ec40a64d + client-secret: WGVJZmhBMHJ3UmFZMDhtZ1U0NGluUEx4SFVZU3pjL2Q5R3k2RkFPd0RvTW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== + host: 127.0.0.1 + port: 8888 + # 最大重连次数 + max-reconnect-count: 20 + # 重连时间差 + reconnect-time-step: 1 + # 心跳时间 + delay-ping-seconds: 3 + # 开启上报服务器数据 + send-client-info-active: false + # 上报服务器数据时间 + send-client-info-second: 30 + server: port: 8082 url: http://192.168.0.104:8082/news @@ -76,21 +106,21 @@ file: # 安全 security: oauth2: - oauth-server: https://www.wgink.ink/usercenter + oauth-server: http://192.168.0.113:7001/usercenter oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} client: - client-id: b05e18273f824e40883c0405a10da0f4 - client-secret: dG5uQ3FDVEI1VUpZOER3bDFpMnc4SlJlOERCbzhSaS9LNVE0MmI1T3BpTW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg - user-authorization-uri: ${security.oauth2.oauth-server}/oauth/authorize - access-token-uri: ${security.oauth2.oauth-server}/oauth/token + client-id: f8190a1a94354105b3748ad3ec40a64d + client-secret: WGVJZmhBMHJ3UmFZMDhtZ1U0NGluUEx4SFVZU3pjL2Q5R3k2RkFPd0RvTW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== + user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize + access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token grant-type: authorization_code resource: jwt: - key-uri: ${security.oauth2.oauth-server}/oauth/token_key - token-info-uri: ${security.oauth2.oauth-server}/oauth/check_token + key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key + token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token user-info-uri: ${security.oauth2.oauth-server}/user authorization: - check-token-access: ${security.oauth2.oauth-server}/oauth/token_key + check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key api-path: user-center: ${security.oauth2.oauth-server}