Merge pull request #1 from WeBankFinTech/dev-1.0.0

Dev 1.0.0
WeBankFinTech · Apr 28, 2022 · 454f4a3 · 454f4a3
2 parents d081ae5 + a970e4f
commit 454f4a3
Show file tree

Hide file tree

Showing 215 changed files with 6,629 additions and 3,713 deletions.
diff --git a/assembly-package/config/application-exchangis.yml b/assembly-package/config/application-exchangis.yml
@@ -1,12 +1,12 @@
 server:
-  port: 9321
+  port: 9500
 spring:
   application:
     name: exchangis-server
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://127.0.0.1:20303/eureka/
+      defaultZone: http://127.0.0.1:20503/eureka/
   instance:
     metadata-map:
       test: wedatasphere
@@ -17,4 +17,4 @@ management:
       exposure:
         include: refresh,info
 logging:
-  config: classpath:log4j2.xml
+  config: classpath:log4j2.xml
diff --git a/assembly-package/config/exchangis-server.properties b/assembly-package/config/exchangis-server.properties
@@ -15,8 +15,6 @@
 #
 #
 
-#wds.linkis.test.mode=false
-
 wds.linkis.server.mybatis.datasource.url=jdbc:mysql://localhost:3306/database?useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
 
 wds.linkis.server.mybatis.datasource.username=username
@@ -27,30 +25,27 @@ wds.linkis.log.clear=true
 
 wds.linkis.server.version=v1
 
-## datasource client
+# datasource client
 wds.exchangis.datasource.client.serverurl=
 wds.exchangis.datasource.client.authtoken.key=DATASOURCE-AUTH
 wds.exchangis.datasource.client.authtoken.value=DATASOURCE-AUTH
 wds.exchangis.datasource.client.dws.version=v1
 
+# launcher client
+wds.exchangis.client.linkis.server-url=
+wds.exchangis.client.linkis.token.value=DATASOURCE-AUTH
 wds.exchangis.datasource.extension.dir=exchangis-extds
 
-wds.exchangis.linkis.serverurl=
-
 ##restful
 wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.exchangis.datasource.server.restful.api,\
   com.webank.wedatasphere.exchangis.project.server.restful,\
   com.webank.wedatasphere.exchangis.job.server.restful
-wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss/framework/appconn/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/workflow/dao/impl/*.xml,classpath*:com/webank/wedatasphere/exchangis/job/server/mapper/impl/*.xml
+wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/exchangis/job/server/mapper/impl/*.xml:\
+  ,classpath*:com/webank/wedatasphere/exchangis/project/server/mapper/impl/*.xml
 
 wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.exchangis.dao,\
-  com.webank.wedatasphere.exchangis.project.server.dao,\
-  com.webank.wedatasphere.linkis.configuration.dao,\
-  com.webank.wedatasphere.dss.framework.appconn.dao,\
-  com.webank.wedatasphere.dss.workflow.dao,\
-  com.webank.wedatasphere.linkis.metadata.dao,\
-  com.webank.wedatasphere.exchangis.job.server.mapper,\
-  com.webank.wedatasphere.exchangis.job.server.dao
+  com.webank.wedatasphere.exchangis.project.server.mapper,\
+  com.webank.wedatasphere.exchangis.job.server.mapper
 
 
 

diff --git a/assembly-package/config/log4j2.xml b/assembly-package/config/log4j2.xml
@@ -25,21 +25,20 @@
             <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
         </Console>
-<!--        <RollingFile name="RollingFile" fileName="${sys:log.path}/${sys:serviceName}.log"-->
-<!--                     filePattern="${sys:log.path}/$${date:yyyy-MM}/${sys:serviceName}/exchangis-log-%d{yyyy-MM-dd}-%i.log">-->
-<!--            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>-->
-<!--            <SizeBasedTriggeringPolicy size="100MB"/>-->
-<!--            <DefaultRolloverStrategy max="20"/>-->
-<!--        </RollingFile>-->
+        <RollingFile name="RollingFile" fileName="${sys:log.path}/${sys:serviceName}.log"
+                     filePattern="${sys:log.path}/$${date:yyyy-MM}/${sys:serviceName}/exchangis-log-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
+            <SizeBasedTriggeringPolicy size="100MB"/>
+            <DefaultRolloverStrategy max="20"/>
+        </RollingFile>
     </appenders>
     <loggers>
         <root level="INFO" additivity="false">
-<!--            <appender-ref ref="RollingFile"/>-->
+            <appender-ref ref="RollingFile"/>
             <appender-ref ref="Console"/>
         </root>
         <logger name="com.webank.wedatasphere.exchangis.job.server.log.DefaultRpcJobLogger$" level="INFO" additivity="true">
             <appender-ref ref="RpcLog"/>
         </logger>
     </loggers>
 </configuration>
-