From 5ddf16d38bd31179907956d1c6f679d82b9e3685 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Mon, 28 Feb 2022 12:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8A=E5=9C=B0?=
=?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 7 -------
src/main/resources/application-prod.yml | 10 +++-------
src/main/resources/application-ws.yml | 11 +++++------
src/main/resources/privateKey.txt | 13 -------------
4 files changed, 8 insertions(+), 33 deletions(-)
delete mode 100644 src/main/resources/privateKey.txt
diff --git a/pom.xml b/pom.xml
index 385a85a..69cc66a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,13 +128,6 @@
org.springframework.kafka
spring-kafka
-
-
- cn.com.tenlion
- inspur-msb-h5-auth
- 0.0.1-SNAPSHOT
- compile
-
com.google.code.gson
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 69c5b00..75b0131 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@
server:
port: 7011
- ip: 1.24.238.149
- url: http://${server.ip}:37210/population
+ ip: www.wlcbsyzl.cn
+ url: http://${server.ip}/population
system-title: 人口基础信息库
system-sub-title: 人口基础信息库
default-home-page: default.html
@@ -139,7 +139,7 @@ file:
api-path:
#103 155
user-center: http://10.25.242.190:37210/usercenter
- user-center-2: http://1.24.238.149:37210/usercenter
+ user-center-2: http://www.wlcbsyzl.cn/usercenter
security:
oauth2:
@@ -166,7 +166,3 @@ logging:
level:
root: error
ink.wgink: debug
-
-inspur-auth:
- appId: 9cadc6c3-53df-407f-b83f-fe42f36a3488
- redirectUri: http://1.24.238.149:37210/population/inspur/index
diff --git a/src/main/resources/application-ws.yml b/src/main/resources/application-ws.yml
index 14a26a5..25bc848 100644
--- a/src/main/resources/application-ws.yml
+++ b/src/main/resources/application-ws.yml
@@ -92,13 +92,13 @@ spring:
# 安全
security:
oauth2:
- oauth-server: http://1.24.238.149:37210/usercenter/
+ oauth-server: http://192.168.0.155:7011/usercenter
oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
client:
#client-id: c00491da506842ddb516d4b1e5ccd13e
- client-id: 8efff6f8f7fc463e8eb63e3b5174f448
+ client-id: 5bc261e8e21c40a4aade918ba12299c1
#client-secret: bll3ZVZuUGZsSXBqckJjRVNEMkc3bklic0pOZDYyWkk0SFd2eDY3N3dhUGxIdG9KZmEyTjJIRnI0dG1McEdEVA==
- client-secret: b1hPdUE1NkJlM1RmbS9MTVlnYUR2QTI5NEcyTFpGandTNC8zVTh5cW5CTGxIdG9KZmEyTjJIRnI0dG1McEdEVA==
+ client-secret: a0oweWNraWNQRkprcDY4NURKKzFtSktOV08vUS9sclBxY0JmRStNNkNKN2xIdG9KZmEyTjJIRnI0dG1McEdEVA==
user-authorization-uri: ${security.oauth2.oauth-server}/oauth2_client/authorize
access-token-uri: ${security.oauth2.oauth-server}/oauth2_client/token
grant-type: authorization_code
@@ -110,8 +110,7 @@ security:
authorization:
check-token-access: ${security.oauth2.oauth-server}/oauth2_client/token_key
api-path:
- #user-center: http://192.168.0.155:7011/usercenter
- user-center: http://1.24.238.149:37210/usercenter/
+ user-center: http://192.168.0.155:7011/usercenter
# 数据库
mybatis:
@@ -174,4 +173,4 @@ logging:
inspur-auth:
appId: 9cadc6c3-53df-407f-b83f-fe42f36a3488
- redirectUri: http://dlho.cn:9003/signup/inspur/index
\ No newline at end of file
+ redirectUri: http://dlho.cn:9003/population/inspur/index
\ No newline at end of file
diff --git a/src/main/resources/privateKey.txt b/src/main/resources/privateKey.txt
deleted file mode 100644
index a4bafdd..0000000
--- a/src/main/resources/privateKey.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-MIICXAIBAAKBgQCs5mYn9oTlN4tKWkPSdfkhrp1IouzfggNIJvQBMkCqffc3qLAT
-Gd3Jh245hdUrDIi3L/r5H3b+MwAgNxX52ywiXdrEhk7FxtHRXTZJ8YNxmDuL8XqR
-H1DcNaDPS74Qx80EsXjSzhQQ+GCvJ8cUw2d+TbxM1KFo6I2nCJP/m+0ChQIDAQAB
-AoGAOMeI8MLCLcwp0AcIksrvP6JqQHpQs62sijtQkjwAhHzNfNfGyt8JuK7jAbzz
-nimFlDMLhlhQ6XWyKuIsM1tIiI4mZs1Nji/9mJoMylRjqKrZDI213nSY7FHq2CCf
-Ti8dVSlwLzfEM+2y2/R9MyX7tqmFxvuDfgCGSxK4z9hhEIECQQDh1/BrdnGyx68t
-bckXuZmSqGk1THGk9zyh4FAuBdXjaRVUwOKdSnE6evCrdsVUSAPtGHLeuxJDQJUK
-iV11XVLRAkEAw/yt8yji2Fqhau5xd/c4yrj9+JnK8qla7yNFPgheHpv65BbTwzgz
-pJmGuwJnVByLUyVnU6w56FxG0SbjgqPZdQJAC5lxqbNNp6cF4klvOJ65uoSX0rr4
-Y0angJDqzVJTZ/ivtciqWvXF1wEVd1kETY3dVcIZtELbb0TT4tSnTi3a4QJAdsLK
-Idv3wkUBJYwB5EFB/84j0B5Zlbw8J0cHMXTem8vHN6oBfn2zBZ4mv3HQbW6ymprC
-xzhJCt3H5/uZx9ND9QJBALt/kH8vSHEo/JLZk87SX7NQwk9OCLpaedPRIiB3dA5U
-US1pl0Ixp/acwuUfsvZ4IAcNW9FC0+Qs0xowKMJIiiY=
\ No newline at end of file