增加本地测试环境

王言钊
1 parent a5a8336c
Showing 5 changed files with 154 additions and 11 deletions
pom.xml
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/resources/application-dev.properties
src/main/resources/application-test.properties
@@ -231,7 +231,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-
         </plugins>
     </build>
@@ -249,6 +248,16 @@
         </profile>
         <!-- 生产环境 -->
         <profile>
+            <id>test</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <environment>test</environment>
+            </properties>
+        </profile>
+        <!-- 生产环境 -->
+        <profile>
             <id>prod</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
@@ -30,17 +30,25 @@ public class ShenheApplication extends SpringBootServletInitializer {
     //url的前缀
     private static final String CAS_SERVER_URL_PREFIX = "https://user.cnlive.com/OpenSSO2";
     private static final String CAS_SERVER_LOGIN_URL = "https://user.cnlive.com/OpenSSO2/login";
-    //本机的名称
-    private static final String SERVER_NAME = "http://test.shen.cnlive.com:82";
+    /**
+     * 本机的名称
+     */
+    @Value("${SERVER_NAME}")
+    private  String SERVER_NAME ;
-    //登录入口
-    private static final String SERVICE_LOGIN = "http://test.shen.cnlive.com:82/users/login";
+    /**
+     * 登录入口
+     */
+    @Value("${SERVICE_LOGIN}")
+    private  String SERVICE_LOGIN ;
-    //登出
-    private static final String SERVICE_LOGINOUT = "http://test.shen.cnlive.com:82/users/logout";
+    /**
+     * 登出
+     */
+    @Value("${SERVICE_LOGINOUT}")
+    private  String SERVICE_LOGINOUT ;
     public static void main(String[] args) {
-//		SpringApplication.run(ShenheApplication.class, args);
         SpringApplicationBuilder builder = new SpringApplicationBuilder(ShenheApplication.class);
         builder.headless(true).run(args);
         // 设置Headless模式,linux系统下
@@ -81,6 +89,7 @@ public class ShenheApplication extends SpringBootServletInitializer {
         Map<String, String> initParameters = new HashMap<String, String>();
         initParameters.put("casServerLoginUrl", CAS_SERVER_LOGIN_URL);
         initParameters.put("service", SERVICE_LOGIN);
+        System.out.println("==========================="+SERVICE_LOGIN);
         initParameters.put("ignorePattern", "/api/*|/logging/*");
         registration.setInitParameters(initParameters);
         // 设定加载的顺序
@@ -15,6 +15,7 @@ import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +42,15 @@ public class UsersController extends BaseController {
     @Autowired
     SitesServiceImpl sitesService;
+    /**
+     * 登录入口
+     */
+    @Value("${SERVICE_LOGIN}")
+    private  String SERVICE_LOGIN ;
+
+    @Value("${spring.localhost.url}")
+    private String redirecpageturl;
+
     @GetMapping(value = "/{id}")
     @ResponseBody
     public Object getTest(@PathVariable Integer id) {
@@ -51,13 +61,13 @@ public class UsersController extends BaseController {
     public String index(HttpServletRequest request) {
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         if (CommonUtils.isNull(principal)) {
-            return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://shen.cnlive.com/users/login";
+            return "redirect:https://user.cnlive.com/OpenSSO2/login?service="+SERVICE_LOGIN;
         }
         //用户ID
         String id = principal.getName();
         if (CommonUtils.isNotEmpty(id)) {
             ShyUsers user = usersService.get(Integer.parseInt(id));
-            if (CommonUtils.isNotNull(user) && user.getState()) {
+            if (CommonUtils.isNotNull(user) && user.getState()){
                 SessionUser sessionUser = new SessionUser();
                 sessionUser.setUserId(user.getUser_id());
                 sessionUser.setSpid(Integer.parseInt(principal.getAttributes().get("new_sp_id").toString()));
@@ -67,7 +77,7 @@ public class UsersController extends BaseController {
                 sessionUser.setLogo(user.getUser_logo());
                 sessionUser.setMaster(user.getMaster());
                 request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser);
-                return "redirect:http://shen.cnlive.com/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
+                return "redirect:"+redirecpageturl+"/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
             }
         }
         return "page/error.html";
@@ -71,6 +71,15 @@ platformValue=10011438
 #\u672C\u673A\u5730\u5740
 spring.localhost.url=http://test.shen.cnlive.com
+#\u672C\u673A\u7684\u540D\u79F0
+SERVER_NAME=http://test.shen.cnlive.com:82
+
+#\u767B\u5F55\u5165\u53E3
+SERVICE_LOGIN=http://test.shen.cnlive.com:82/users/login
+
+#\u767B\u51FA
+SERVICE_LOGINOUT=http://test.shen.cnlive.com:82/users/logout
+
 #\u62BD\u5E27\u5E38\u91CF
 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
+server.port=80
+
+spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=M345sdfss4!
+
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+server.tomcat.protocol_header=x-forwarded-proto
+server.use-forward-headers=true
+
+spring.jpa.properties.hibernate.hbm2ddl.auto=update
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.show-sql= true
+
+server.tomcat.uri-encoding=UTF-8
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
+
+spring.thymeleaf.mode=LEGACYHTML5
+spring.thymeleaf.cache=false
+#spring.thymeleaf.encoding=UTF-8
+#spring.thymeleaf.content-type=text/html
+#\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
+
+#\u6253\u5370\u8FD0\u884C\u65F6\u7684sql
+#logging.level.com.cnlive.shenhe.mapper=debug
+
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.type-aliases-package=com.cnlive.shenhe.entity
+
+#rabbitmq\u76F8\u5173\u914D\u7F6E
+spring.rabbitmq.host=10.254.174.131
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=test
+spring.rabbitmq.password=p3~amKKt9
+# \u5F00\u542F\u53D1\u9001\u786E\u8BA4
+spring.rabbitmq.publisher-confirms=true
+# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE
+spring.rabbitmq.publisher-returns=true
+# \u5F00\u542FACK
+spring.rabbitmq.listener.direct.acknowledge-mode=manual
+spring.rabbitmq.listener.simple.acknowledge-mode=manual
+
+#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5
+#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
+
+#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico
+spring.mvc.favicon.enabled = false
+
+#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API
+speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
+
+#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528
+spring.application.name=cnlive_shenhe_test
+spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log
+
+sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
+sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
+
+#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F
+queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
+queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
+
+#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF
+url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
+platformKey =AUDIT
+platformValue=10011438
+
+#\u672C\u673A\u5730\u5740
+spring.localhost.url=http://test.shen.cnlive.com
+
+#\u672C\u673A\u7684\u540D\u79F0
+SERVER_NAME=http://test.shen.cnlive.com:80
+
+#\u767B\u5F55\u5165\u53E3
+SERVICE_LOGIN=http://test.shen.cnlive.com:80/users/login
+
+#\u767B\u51FA
+SERVICE_LOGINOUT=http://test.shen.cnlive.com:80/users/logout
+
+#\u62BD\u5E27\u5E38\u91CF
+avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
+avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
+avsmple_url=http://test.transcode.cnlive.com/api/request
+avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
+
+#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F
+live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
+
+#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF
+email_app_id=769_jetja50p18
+email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
+email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
+
+#\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D
+qn_bucket=cnlivetest
+qn_domain=http://test.qnvod.cnlive.com
+ks_bucket=cnlive-test
+ks_domain=http://test.wideo.cnlive.com
+
+#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84
+desdir=shen
+yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/
+cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio