Merge pull request #1149 from WeDataSphere/master

Update latest code

Author: htyredc

.gitattributes

@@ -1,5 +1,4 @@
 *.js linguist-language=java
 *.css linguist-language=java
 *.html linguist-language=java
-*.vue linguist-language=java
-*.zip filter=lfs diff=lfs merge=lfs -text
+*.vue linguist-language=java

.gitignore

@@ -1,5 +1,9 @@
 .idea
 .idea/*
+.metals
+.vscode
+.scalafmt.conf
+.bloop
 
 .DS_Store
 
@@ -101,6 +105,9 @@ dss-apps/dss-data-governance/dss-data-warehouse-dao/target
 dss-apps/dss-data-governance/dss-data-warehouse-service/target
 dss-apps/dss-data-governance/dss-data-warehouse-server/target
 
+#dss-git
+dss-git/dss-git-common/target
+dss-git/dss-git-server/target
 
 # plugins
 plugins/azkaban/linkis-jobtype/target

README-ZH.md

@@ -170,7 +170,7 @@
 
         您也可以扫描下面的二维码，加入我们的 微信群，以获得更快速的响应。
 
-![交流](images/zh_CN/readme/communication.png)
+![交流](images/zh_CN/readme/communication.jpg)
 
 ## 谁在使用 DSS
 

README.md

@@ -168,7 +168,7 @@ English | [中文](README-ZH.md)
 
         You can scan the QR code below to join our WeChat to get more immediate response.
 
-![communication](images/en_US/readme/communication.png)
+![communication](images/en_US/readme/communication.jpg)
 
 ## Who is using DSS
 

assembly/bin/appconn-refresh.sh

@@ -22,7 +22,8 @@ function isSuccess(){
 
 function refresh() {
   while true; do
-    response=$(curl -H "Token-Code:" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load)
+    response=$(curl -H "Token-Code:xxx" -H "Token-User:hadoop" -X GET
+    http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load)
     if [[ $response == *"not appconn manager node"* ]]; then
       echo 'not appconn manager node, we will try again 5 seconds later'
       sleep 5

assembly/bin/dssinstall.sh

@@ -105,7 +105,7 @@ function changeCommonConf(){
   sed -i "s#hostname:.*#hostname: $SERVER_IP#g" $CONF_APPLICATION_YML
   sed -i "s#wds.linkis.server.mybatis.datasource.url.*#wds.linkis.server.mybatis.datasource.url=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB}?characterEncoding=UTF-8#g" $CONF_DSS_PROPERTIES
   sed -i "s#wds.linkis.server.mybatis.datasource.username.*#wds.linkis.server.mybatis.datasource.username=$MYSQL_USER#g" $CONF_DSS_PROPERTIES
-  sed -i "s#wds.linkis.server.mybatis.datasource.password.*#***REMOVED***$MYSQL_PASSWORD#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.server.mybatis.datasource.password.*#wds.linkis.server.mybatis.datasource.password=$MYSQL_PASSWORD#g" $CONF_DSS_PROPERTIES
   sed -i "s#wds.linkis.gateway.ip.*#wds.linkis.gateway.ip=$GATEWAY_INSTALL_IP#g" $CONF_DSS_PROPERTIES
   sed -i "s#wds.linkis.gateway.port.*#wds.linkis.gateway.port=$GATEWAY_PORT#g" $CONF_DSS_PROPERTIES
   sed -i "s#wds.linkis.gateway.url.*#wds.linkis.gateway.url=http://$GATEWAY_INSTALL_IP:$GATEWAY_PORT/#g" $CONF_DSS_PROPERTIES