fix 预发布环境

netflix-service/src/main/java/com/cyksj/common/EnvCommonService.java

@@ -38,7 +38,7 @@ public class EnvCommonService {
 		return domain;
 	}
 	public String getPort() {
-		return port = EnvCommonService.active_prd.equals(getEnv()) ? "8081" : "8083";
+		return port = EnvCommonService.active_prd.equals(getEnv()) ? "8081" : EnvCommonService.active.equals(getEnv()) ? "8083" : "8082";
 	}
 
 	public String getApi() {

netflix-web/src/main/resources/application-pre.yml

@@ -11,7 +11,7 @@ spring:
       max-file-size: 50MB
   #国际化
   messages:
-    basename: i18n.yhlx
+    basename: i18n/yhlx
   mail:
     host: smtp.163.com
     username: yinheluxiangju@163.com
@@ -25,9 +25,9 @@ spring:
     default-encoding: utf-8
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:mysql://172.17.0.17:3306/yhlxj_pre?useAffectedRows=true
+    url: jdbc:mysql://172.19.16.7:33306/yhlxj_pre?useAffectedRows=true
     username: yhlxj
-    password: yhlxj123
+    password: netflix_123
     platform: mysql
     continue-on-error: false
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -126,7 +126,7 @@ wechat:
   oldAppid: wxd58016eee53b6558
   appid: wx6cbc2de2a55e5579
   secret: 2ab6340e7787ab24de9f29094dee9d24
-  domain: https://nf.video/8081/api/
+  domain: https://galaxydvd.com/8082/api/
   #默认微信商户
   shopid: 1634772026
   shopKey: p2B8BAKi2V3PgMDSSez82V67aIvMKBt5
@@ -135,11 +135,11 @@ wechat:
 wx-login:
   appid: wx7c5494c38c6a78bd
   secret: 95c7c542a583b42840765d758ec49bf5
-  redirectUri: https://nf.video/8082/api/auth/wx/authLogin/baseRedirect
-  loginUrl: https://nf.video
-  cpsRedirectUri: https://nf.video/8082/api/cps/manage/wx/authLogin/baseRedirect
-  cpsLoginUrl: https://cps.nf.video/yinhe/cps/loginNexte
-  baRedirectUrl: https://nf.video/8082/api/applets/market/task/bind/wx/baseRedirect
+  redirectUri: https://galaxydvd.com/8082/api/auth/wx/authLogin/baseRedirect
+  loginUrl: https://galaxydvd.com
+  cpsRedirectUri: https://galaxydvd.com/8082/api/cps/manage/wx/authLogin/baseRedirect
+  cpsLoginUrl: https://cps.galaxydvd.com/yinhe/cps/loginNexte
+  baRedirectUrl: https://galaxydvd.com/8082/api/applets/market/task/bind/wx/baseRedirect
   remark: 银河录像网页微信登录
 
 yhlx:
@@ -147,7 +147,7 @@ yhlx:
   corpSecret: Ov0mlArSItBrs9EuOMt5Ou_faGdplDDIvPgIhgup51E
   encodingAESKey: bqoACJutQEgW7KOgBoezuQkk7y2HQSyRp1sQ8qnAi6C
   token: 2e0aWIfBewWNN5BNMq9cBeLf9x
-  domain: https://nf.video/8081/api/
+  domain: https://galaxydvd.com/8082/api/
 
 #银河录像局小程序
 yhmini:
@@ -160,7 +160,7 @@ advertisement:
   secret: 19b5f5121bc7cc1bc010ee7c4ac509e9
   shopId: 1644299849
   shopKey: 5y5ZScTJGm0q0umHQOD4r3EfjRvCioUx
-  notify: https://nf.video/8081/api/
+  notify: https://galaxydvd.com/8082/api/
 
 #广告投放公众号
 advertisementwxapp:
@@ -174,7 +174,11 @@ google:
   clientId: 371004574299-hhj668e7g9mbvh3o4dentfniinmu6kfk.apps.googleusercontent.com
   clientSecret: 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
 
+feedback:
+  mail: lvsinco@gmail.com
+
+
 cryptomus:
   shopId: 15d39001-dec3-4949-8872-69b241825c5d
   shopKey: zk4alqQNueK2RiWH2YM3auEEDbCxYZGh2XsJQv3AdoJYASQkUxvaGR0ID81xIg1sm0H3ZMeWgDzIFlqMYJeqrBvQeFRHceEH83PABCiAYBeGp75XfqoUN8Oa1No1UYas
-  host: https://nf.video/8081/api/
+  host: https://galaxydvd.com/8082/api/