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

gic-platform-finance-web/pom.xml

@@ -80,21 +80,20 @@
             <version>${gic-enterprise-base-api}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.1.5.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>logback-classic</artifactId>
-                    <groupId>ch.qos.logback</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-platform-auth-api</artifactId>
+            <version>${gic-enterprise-base-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-platform-enterprise-api</artifactId>
+            <version>${gic-enterprise-base-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-platform-finance-api</artifactId>
+            <version>${gic-platform-finance-api}</version>
         </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -118,17 +117,40 @@
             <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</groupId>
-            <artifactId>gic-platform-finance-api</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <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-finance-web/src/main/java/com/gic/finance/web/Main.java

 package com.gic.finance.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.finance",
         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-finance-web/src/main/resources/application.properties

+app.id=gic-platform-finance
+app.project-code=gic-platform-finance
+
+logging.level.org.springframework.security=DEBUG
+
+server.port=8350
+server.servlet.context-path=/gic-finance-web
+server.servlet.session.cookie.name=GICOPERATIONWEBSESSIONID
+server.servlet.session.timeout=3600
+
+spring.session.store-type=REDIS
+spring.session.redis.namespace=gic-platform-finance
+spring.session.timeout=3600
+
+spring.redis.host=123.207.187.158
+spring.redis.port=27019
+spring.redis.password=crs-6vmo0g9s:gic*0571
+spring.redis.database=11
+spring.redis.timeout=5000
+
+security.oauth2.client.clientId=gicfinanceid
+security.oauth2.client.clientSecret=gicfinancesecret
+security.oauth2.client.user-authorization-uri=http://localhost:8900/gic-authcenter/oauth/authorize
+security.oauth2.client.access-token-uri=http://localhost:8900/gic-authcenter/oauth/token
+security.oauth2.resource.user-info-uri=http://localhost:8900/gic-authcenter/resource/userDetails

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

-server:
-  port: 8350
-  servlet:
-    context-path: /gic-finance-web
-  tomcat:
-    uri-encoding: UTF-8
-
-spring:
-  jackson:
-    serialization:
-      # 以时间戳返回日期
-      write-dates-as-timestamps: true
-  http:
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true

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

@@ -40,4 +40,7 @@
     <dubbo:reference interface="com.gic.finance.service.TransferAccountsApprovalApiService" id="transferAccountsApprovalApiService" timeout="60000" />
     <!--发票管理-->
     <dubbo:reference interface="com.gic.finance.service.InvoiceManageApiService" id="invoiceManageApiService" 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