Merge remote-tracking branch 'origin/developer' into developer

gic-platform-operation-web/pom.xml

@@ -89,7 +89,7 @@
             <artifactId>gic-platform-enterprise-api</artifactId>
             <version>${gic-enterprise-base-api}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>2.1.5.RELEASE</version>
@@ -104,7 +104,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -128,12 +128,39 @@
             <version>3.11</version>
         </dependency>
         <dependency>
+            <groupId>com.gic.authcenter </groupId>
+            <artifactId>gic-authcenter-security-core </artifactId>
+            <version>${gic-authcenter-security-core} </version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>com.gic </groupId>
             <artifactId>gic-redis-data </artifactId>
             <version>${gic-redis-data} </version>
         </dependency>
+        <dependency>
+            <groupId>com.gic.authcenter</groupId>
+            <artifactId>gic-authcenter-api</artifactId>
+            <version>${gic-authcenter-api}</version>
+        </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.gic.authcenter</groupId>
+                <artifactId>gic-authcenter</artifactId>
+                <version>4.0.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>

gic-platform-operation-web/src/main/java/com/gic/operation/web/Main.java

 package com.gic.operation.web;
 
+import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
+import com.gic.authcenter.security.core.anno.EnableGicOAuth2Sso;
+import com.gic.authcenter.security.core.boot.GicSsoSecurityConfigAdapter;
 import com.gic.dubbo.util.DubboContextUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -15,10 +18,8 @@ import org.springframework.context.annotation.ImportResource;
  * @author zhurz
  */
 @SpringBootApplication(
-        scanBasePackages = "com.gic",
+        scanBasePackages = "com.gic.operation.*",
         exclude = {
-                RedisAutoConfiguration.class,
-                RedisRepositoriesAutoConfiguration.class,
                 QuartzAutoConfiguration.class
         }
 )
@@ -29,9 +30,11 @@ import org.springframework.context.annotation.ImportResource;
         "classpath*:spring-interceptor.xml",
         "classpath*:redis-init.xml"
 })
-public class Main {
+@EnableApolloConfig({ "application", " BUZ.oauth.4.0 " })
+@EnableGicOAuth2Sso
+public class Main extends GicSsoSecurityConfigAdapter {
 
-    public static void main(String[] args) {
+    public static void main(String[] args){
         ConfigurableApplicationContext context = SpringApplication.run(Main.class, args);
         DubboContextUtil.setApplicationContext(context);
     }

gic-platform-operation-web/src/main/resources/application.yml

@@ -15,3 +15,5 @@ spring:
       charset: UTF-8
       enabled: true
       force: true
+app:
+  id: gic-platform-operation-web

gic-platform-operation-web/src/main/resources/dubbo-gic-platform-operation-web.xml

@@ -45,4 +45,7 @@
     <dubbo:reference interface="com.gic.enterprise.service.PlatformBrandApiService" id="platformBrandApiService" timeout="60000" />
     <!--字典 -->
     <dubbo:reference interface="com.gic.enterprise.service.DictApiService" id="dictApiService" timeout="60000" />
+    <dubbo:reference id="gicLogService" interface="com.gic.authcenter.api.service.GicLogService"/>
+    <dubbo:reference id="gicAppService" interface="com.gic.authcenter.api.service.GicAppService"/>
+    <dubbo:reference id="gicUserService" interface="com.gic.authcenter.api.service.GicUserService"/>
 </beans>
\ No newline at end of file