al-oss 替换整理删除

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/ZhengzaiAppVersionController.java

@@ -34,9 +34,6 @@ public class ZhengzaiAppVersionController extends BaseController {
     @Value("${liquidnet.client.admin.platformUrl}")
     private String platformUrl;
 
-    @Value("${liquidnet.al-oss.appUrl}")
-    private String appUrl;
-
     private String prefix = "zhengzai/kylin/zhengzaiAppVersion";
 
     @Autowired

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -41,7 +41,7 @@ import java.util.*;
 @Service
 public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUpush> implements IAdminUpushService {
 
-    @Value("${liquidnet.al-oss.imgUrl}")
+    @Value("${liquidnet.aliyun.oss.imgUrl}")
     private String imgUrl;
 
     @Value("${liquidnet.umeng.ios.appkey}")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 @Service
 public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBanners> implements IKylinBannersService {
 
-    @Value("${liquidnet.al-oss.imgUrl}")
+    @Value("${liquidnet.aliyun.oss.imgUrl}")
     private String imgUrl;
 
     @Autowired

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinZhengzaiAppVersionsServiceImpl.java

@@ -37,7 +37,7 @@ import java.util.List;
 @Service
 public class KylinZhengzaiAppVersionsServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBanners> implements IKylinBannersService {
 
-    @Value("${liquidnet.al-oss.appUrl}")
+    @Value("${liquidnet.aliyun.oss.appUrl}")
     private String appUrl;
 
     @Autowired

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -19,9 +19,6 @@ liquidnet:
       url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)" #票务
       url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品
       url14: "${liquidnet.client.admin.phpMallUrl}/admin/good/collective/quick?page=1&per_page=50" #商品集合
-    al-oss:
-      imgUrl: "https://img.zhengzai.tv/"
-      appUrl: "https://app.zhengzai.tv/"
 
 # 开发环境配置
 server:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -165,8 +165,4 @@ global-auth:
 #    - ${liquidnet.info.context}/station/out
 # -----------------------------------------------------------
 
-# -----------------------------------------------------------
-liquidnet:
-  al-oss:
-    imgUrl: "https://img.zhengzai.tv/"
 # -----------------------------------------------------------
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-dev.yml

@@ -19,11 +19,5 @@ liquidnet:
   mongodb:
     sslEnabled: false
     database: dev_ln_scene
-  al-oss:
-    imgUrl: "https://img.zhengzai.tv/"
-    appUrl: "https://app.zhengzai.tv/"
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
-    accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
-    accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
 
 #以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-test.yml

@@ -19,11 +19,5 @@ liquidnet:
   mongodb:
     sslEnabled: false
     database: test_ln_scene
-  al-oss:
-    imgUrl: "https://img.zhengzai.tv/"
-    appUrl: "https://app.zhengzai.tv/"
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
-    accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
-    accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
 
 #以下为spring各环境个性配置

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.List;
 @Service
 public class BannersServiceImpl implements IKylinBannersService {
 
-    @Value("${liquidnet.al-oss.imgUrl}")
+    @Value("${liquidnet.aliyun.oss.imgUrl}")
     private String imgUrl;
 
     @Autowired

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinUpushServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.LinkedList;
 @Service
 public class KylinUpushServiceImpl {
 
-    @Value("${liquidnet.al-oss.imgUrl}")
+    @Value("${liquidnet.aliyun.oss.imgUrl}")
     private String imgUrl;
 
     @Autowired

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -45,11 +45,11 @@ import java.util.UUID;
 @RequestMapping("basicServices/alOss")
 public class AlOssController {
 
-    @Value("${liquidnet.al-oss.endpoint}")
+    @Value("${liquidnet.aliyun.oss.endpoint}")
     private String endpoint;
-    @Value("${liquidnet.al-oss.accessKeyId}")
+    @Value("${liquidnet.aliyun.oss.accessKeyId}")
     private String accessKeyId;
-    @Value("${liquidnet.al-oss.accessKeySecret}")
+    @Value("${liquidnet.aliyun.oss.accessKeySecret}")
     private String accessKeySecret;
 
     @Autowired

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/basicServices/AdminUpushServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.LinkedList;
 @Service
 public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUpush> implements IAdminUpushService {
 
-    @Value("${liquidnet.al-oss.imgUrl}")
+    @Value("${liquidnet.aliyun.oss.imgUrl}")
     private String imgUrl;
 
     @Autowired