'commit'

5 years ago · ed421b1acb
parent 208f4bd827
commit ed421b1acb
115 changed files with 11 additions and 11 deletions
--- a/dsssoserver/.idea/deployment.xml
+++ b/dsssoserver/.idea/deployment.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" serverName="192.168.2.199">
+  <component name="PublishConfigData" serverName="10.10.14.242">
    <serverData>
-      <paths name="192.168.2.199">
+      <paths name="10.10.14.242">
        <serverdata>
          <mappings>
            <mapping deploy="/usr/local/tomcat8/webapps/dsssoserver" local="$PROJECT_DIR$/WebRoot" web="/" />
--- a/dsssoserver/.idea/sshConfigs.xml
+++ b/dsssoserver/.idea/sshConfigs.xml
@ -2,7 +2,7 @@
 <project version="4">
  <component name="SshConfigs">
    <configs>
-      <sshConfig authType="PASSWORD" host="192.168.2.199" id="a549b502-a506-482e-9a38-0eb5cd233ca3" port="26611" nameFormat="DESCRIPTIVE" username="root" />
+      <sshConfig authType="PASSWORD" host="10.10.14.242" id="a549b502-a506-482e-9a38-0eb5cd233ca3" port="22" nameFormat="DESCRIPTIVE" username="root" />
    </configs>
  </component>
 </project>
--- a/dsssoserver/.idea/webServers.xml
+++ b/dsssoserver/.idea/webServers.xml
@ -2,8 +2,8 @@
 <project version="4">
  <component name="WebServers">
    <option name="servers">
-      <webServer id="c14440bd-4d92-4af8-b856-98d20efbf74a" name="192.168.2.199">
+      <webServer id="c14440bd-4d92-4af8-b856-98d20efbf74a" name="10.10.14.242">
-        <fileTransfer accessType="SFTP" host="192.168.2.199" port="26611" sshConfigId="a549b502-a506-482e-9a38-0eb5cd233ca3" sshConfig="root@192.168.2.199:26611 password">
+        <fileTransfer accessType="SFTP" host="10.10.14.242" port="22" sshConfigId="a549b502-a506-482e-9a38-0eb5cd233ca3" sshConfig="root@10.10.14.242:22 password">
          <advancedOptions>
            <advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
          </advancedOptions>
--- a/dsssoserver/lib/FastHttpClient-1.7.jar
+++ b/dsssoserver/lib/FastHttpClient-1.7.jar
--- a/dsssoserver/lib/activation-1.1.jar
+++ b/dsssoserver/lib/activation-1.1.jar
--- a/dsssoserver/lib/aliyun-java-sdk-core-3.4.0.jar
+++ b/dsssoserver/lib/aliyun-java-sdk-core-3.4.0.jar
--- a/dsssoserver/lib/aliyun-java-sdk-dysmsapi-1.1.0.jar
+++ b/dsssoserver/lib/aliyun-java-sdk-dysmsapi-1.1.0.jar
--- a/dsssoserver/lib/aliyun-java-sdk-ecs-4.2.0.jar
+++ b/dsssoserver/lib/aliyun-java-sdk-ecs-4.2.0.jar
--- a/dsssoserver/lib/aliyun-java-sdk-ram-3.0.0.jar
+++ b/dsssoserver/lib/aliyun-java-sdk-ram-3.0.0.jar
--- a/dsssoserver/lib/aliyun-java-sdk-sts-3.0.0.jar
+++ b/dsssoserver/lib/aliyun-java-sdk-sts-3.0.0.jar
--- a/dsssoserver/lib/aliyun-sdk-oss-3.4.1.jar
+++ b/dsssoserver/lib/aliyun-sdk-oss-3.4.1.jar
--- a/dsssoserver/lib/audience-annotations-0.5.0.jar
+++ b/dsssoserver/lib/audience-annotations-0.5.0.jar
--- a/dsssoserver/lib/bboss-core-5.5.2.jar
+++ b/dsssoserver/lib/bboss-core-5.5.2.jar
--- a/dsssoserver/lib/bboss-elasticsearch-geoip-5.8.1.jar
+++ b/dsssoserver/lib/bboss-elasticsearch-geoip-5.8.1.jar
--- a/dsssoserver/lib/bboss-elasticsearch-rest-5.8.1.jar
+++ b/dsssoserver/lib/bboss-elasticsearch-rest-5.8.1.jar
--- a/dsssoserver/lib/bboss-elasticsearch-rest-booter-5.8.1.jar
+++ b/dsssoserver/lib/bboss-elasticsearch-rest-booter-5.8.1.jar
--- a/dsssoserver/lib/bboss-elasticsearch-rest-jdbc-5.8.1.jar
+++ b/dsssoserver/lib/bboss-elasticsearch-rest-jdbc-5.8.1.jar
--- a/dsssoserver/lib/bboss-http-5.5.3.jar
+++ b/dsssoserver/lib/bboss-http-5.5.3.jar
--- a/dsssoserver/lib/bboss-persistent-5.5.2.jar
+++ b/dsssoserver/lib/bboss-persistent-5.5.2.jar
--- a/dsssoserver/lib/bboss-soa-5.5.2.jar
+++ b/dsssoserver/lib/bboss-soa-5.5.2.jar
--- a/dsssoserver/lib/bboss-util-5.5.2.jar
+++ b/dsssoserver/lib/bboss-util-5.5.2.jar
--- a/dsssoserver/lib/bboss-velocity-5.5.2.jar
+++ b/dsssoserver/lib/bboss-velocity-5.5.2.jar
--- a/dsssoserver/lib/cas-client-core-3.5.1.jar
+++ b/dsssoserver/lib/cas-client-core-3.5.1.jar
--- a/dsssoserver/lib/cglib-nodep-3.1.jar
+++ b/dsssoserver/lib/cglib-nodep-3.1.jar
--- a/dsssoserver/lib/commons-beanutils-1.8.0.jar
+++ b/dsssoserver/lib/commons-beanutils-1.8.0.jar
--- a/dsssoserver/lib/commons-codec-1.12.jar
+++ b/dsssoserver/lib/commons-codec-1.12.jar
--- a/dsssoserver/lib/commons-collections-3.2.1.jar
+++ b/dsssoserver/lib/commons-collections-3.2.1.jar
--- a/dsssoserver/lib/commons-collections4-4.3.jar
+++ b/dsssoserver/lib/commons-collections4-4.3.jar
--- a/dsssoserver/lib/commons-compress-1.18.jar
+++ b/dsssoserver/lib/commons-compress-1.18.jar
--- a/dsssoserver/lib/commons-email-1.5.jar
+++ b/dsssoserver/lib/commons-email-1.5.jar
--- a/dsssoserver/lib/commons-io-1.3.2.jar
+++ b/dsssoserver/lib/commons-io-1.3.2.jar
--- a/dsssoserver/lib/commons-lang-2.5.jar
+++ b/dsssoserver/lib/commons-lang-2.5.jar
--- a/dsssoserver/lib/commons-lang3-3.8.1.jar
+++ b/dsssoserver/lib/commons-lang3-3.8.1.jar
--- a/dsssoserver/lib/commons-logging-1.1.1.jar
+++ b/dsssoserver/lib/commons-logging-1.1.1.jar
--- a/dsssoserver/lib/commons-math3-3.6.1.jar
+++ b/dsssoserver/lib/commons-math3-3.6.1.jar
--- a/dsssoserver/lib/commons-pool2-2.4.2.jar
+++ b/dsssoserver/lib/commons-pool2-2.4.2.jar
--- a/dsssoserver/lib/cos-2020.4.jar
+++ b/dsssoserver/lib/cos-2020.4.jar
--- a/dsssoserver/lib/cron4j-2.2.5.jar
+++ b/dsssoserver/lib/cron4j-2.2.5.jar
--- a/dsssoserver/lib/curvesapi-1.06.jar
+++ b/dsssoserver/lib/curvesapi-1.06.jar
--- a/dsssoserver/lib/dom4j-1.6.1.jar
+++ b/dsssoserver/lib/dom4j-1.6.1.jar
--- a/dsssoserver/lib/druid-1.1.20.jar
+++ b/dsssoserver/lib/druid-1.1.20.jar
--- a/dsssoserver/lib/esdk-obs-java-3.19.5.jar
+++ b/dsssoserver/lib/esdk-obs-java-3.19.5.jar
--- a/dsssoserver/lib/ezmorph-1.0.6.jar
+++ b/dsssoserver/lib/ezmorph-1.0.6.jar
--- a/dsssoserver/lib/fastjson-1.2.60.jar
+++ b/dsssoserver/lib/fastjson-1.2.60.jar
--- a/dsssoserver/lib/ganymed-ssh2-262.jar
+++ b/dsssoserver/lib/ganymed-ssh2-262.jar
--- a/dsssoserver/lib/geoip2-2.12.0.jar
+++ b/dsssoserver/lib/geoip2-2.12.0.jar
--- a/dsssoserver/lib/gson-2.8.5.jar
+++ b/dsssoserver/lib/gson-2.8.5.jar
--- a/dsssoserver/lib/httpclient-4.5.7.jar
+++ b/dsssoserver/lib/httpclient-4.5.7.jar
--- a/dsssoserver/lib/httpcore-4.4.11.jar
+++ b/dsssoserver/lib/httpcore-4.4.11.jar
--- a/dsssoserver/lib/httpmime-4.5.9.jar
+++ b/dsssoserver/lib/httpmime-4.5.9.jar
--- a/dsssoserver/lib/hutool-all-5.5.1.jar
+++ b/dsssoserver/lib/hutool-all-5.5.1.jar
--- a/dsssoserver/lib/jackson-annotations-2.9.9.jar
+++ b/dsssoserver/lib/jackson-annotations-2.9.9.jar
--- a/dsssoserver/lib/jackson-core-2.9.9.jar
+++ b/dsssoserver/lib/jackson-core-2.9.9.jar
--- a/dsssoserver/lib/jackson-databind-2.9.9.jar
+++ b/dsssoserver/lib/jackson-databind-2.9.9.jar
--- a/dsssoserver/lib/jackson-dataformat-csv-2.9.9.jar
+++ b/dsssoserver/lib/jackson-dataformat-csv-2.9.9.jar
--- a/dsssoserver/lib/jackson-datatype-jdk8-2.9.9.jar
+++ b/dsssoserver/lib/jackson-datatype-jdk8-2.9.9.jar
--- a/dsssoserver/lib/jackson-module-paranamer-2.9.9.jar
+++ b/dsssoserver/lib/jackson-module-paranamer-2.9.9.jar
--- a/dsssoserver/lib/jackson-module-scala_2.12-2.9.9.jar
+++ b/dsssoserver/lib/jackson-module-scala_2.12-2.9.9.jar
--- a/dsssoserver/lib/java-uuid-generator-3.1.4.jar
+++ b/dsssoserver/lib/java-uuid-generator-3.1.4.jar
--- a/dsssoserver/lib/java-xmlbuilder-1.1.jar
+++ b/dsssoserver/lib/java-xmlbuilder-1.1.jar
--- a/dsssoserver/lib/javadbf-1.9.4.jar
+++ b/dsssoserver/lib/javadbf-1.9.4.jar
--- a/dsssoserver/lib/javax.mail-1.5.6.jar
+++ b/dsssoserver/lib/javax.mail-1.5.6.jar
--- a/dsssoserver/lib/javax.servlet-api-4.0.1.jar
+++ b/dsssoserver/lib/javax.servlet-api-4.0.1.jar
--- a/dsssoserver/lib/jboss-logging-3.4.0.Final.jar
+++ b/dsssoserver/lib/jboss-logging-3.4.0.Final.jar
--- a/dsssoserver/lib/jdom-1.1.jar
+++ b/dsssoserver/lib/jdom-1.1.jar
--- a/dsssoserver/lib/jedis-2.9.0.jar
+++ b/dsssoserver/lib/jedis-2.9.0.jar
--- a/dsssoserver/lib/jettison-1.1.jar
+++ b/dsssoserver/lib/jettison-1.1.jar
--- a/dsssoserver/lib/jfinal-4.9.03.jar
+++ b/dsssoserver/lib/jfinal-4.9.03.jar
--- a/dsssoserver/lib/jfinal-undertow-2.2.jar
+++ b/dsssoserver/lib/jfinal-undertow-2.2.jar
--- a/dsssoserver/lib/jopt-simple-5.0.4.jar
+++ b/dsssoserver/lib/jopt-simple-5.0.4.jar
--- a/dsssoserver/lib/jsch-0.1.55.jar
+++ b/dsssoserver/lib/jsch-0.1.55.jar
--- a/dsssoserver/lib/json-lib-2.4-jdk15.jar
+++ b/dsssoserver/lib/json-lib-2.4-jdk15.jar
--- a/dsssoserver/lib/jsoup-1.11.3.jar
+++ b/dsssoserver/lib/jsoup-1.11.3.jar
--- a/dsssoserver/lib/jsr305-3.0.2.jar
+++ b/dsssoserver/lib/jsr305-3.0.2.jar
--- a/dsssoserver/lib/jta-1.1.jar
+++ b/dsssoserver/lib/jta-1.1.jar
--- a/dsssoserver/lib/kafka-clients-2.3.0.jar
+++ b/dsssoserver/lib/kafka-clients-2.3.0.jar
--- a/dsssoserver/lib/kafka_2.12-2.3.0.jar
+++ b/dsssoserver/lib/kafka_2.12-2.3.0.jar
--- a/dsssoserver/lib/log4j-api-2.8.2.jar
+++ b/dsssoserver/lib/log4j-api-2.8.2.jar
--- a/dsssoserver/lib/log4j-core-2.8.2.jar
+++ b/dsssoserver/lib/log4j-core-2.8.2.jar
--- a/dsssoserver/lib/logback-classic-1.2.3.jar
+++ b/dsssoserver/lib/logback-classic-1.2.3.jar
--- a/dsssoserver/lib/logback-core-1.2.3.jar
+++ b/dsssoserver/lib/logback-core-1.2.3.jar
--- a/dsssoserver/lib/lz4-java-1.6.0.jar
+++ b/dsssoserver/lib/lz4-java-1.6.0.jar
--- a/dsssoserver/lib/maxmind-db-1.2.2.jar
+++ b/dsssoserver/lib/maxmind-db-1.2.2.jar
--- a/dsssoserver/lib/metrics-core-2.2.0.jar
+++ b/dsssoserver/lib/metrics-core-2.2.0.jar
--- a/dsssoserver/lib/mysql-connector-java-8.0.17.jar
+++ b/dsssoserver/lib/mysql-connector-java-8.0.17.jar
--- a/dsssoserver/lib/okhttp-3.10.0.jar
+++ b/dsssoserver/lib/okhttp-3.10.0.jar
--- a/dsssoserver/lib/okio-1.14.0.jar
+++ b/dsssoserver/lib/okio-1.14.0.jar
--- a/dsssoserver/lib/oro-2.0.8.jar
+++ b/dsssoserver/lib/oro-2.0.8.jar
--- a/dsssoserver/lib/paranamer-2.8.jar
+++ b/dsssoserver/lib/paranamer-2.8.jar
--- a/dsssoserver/lib/poi-4.1.0.jar
+++ b/dsssoserver/lib/poi-4.1.0.jar
--- a/dsssoserver/lib/poi-ooxml-4.1.0.jar
+++ b/dsssoserver/lib/poi-ooxml-4.1.0.jar
--- a/dsssoserver/lib/poi-ooxml-schemas-4.1.0.jar
+++ b/dsssoserver/lib/poi-ooxml-schemas-4.1.0.jar
--- a/dsssoserver/lib/poi-scratchpad-4.1.0.jar
+++ b/dsssoserver/lib/poi-scratchpad-4.1.0.jar
--- a/dsssoserver/lib/protobuf-java-3.6.1.jar
+++ b/dsssoserver/lib/protobuf-java-3.6.1.jar
--- a/dsssoserver/lib/scala-library-2.12.8.jar
+++ b/dsssoserver/lib/scala-library-2.12.8.jar
--- a/dsssoserver/lib/scala-logging_2.12-3.9.0.jar
+++ b/dsssoserver/lib/scala-logging_2.12-3.9.0.jar
--- a/dsssoserver/lib/scala-reflect-2.12.8.jar
+++ b/dsssoserver/lib/scala-reflect-2.12.8.jar
--- a/dsssoserver/lib/slf4j-api-1.7.25.jar
+++ b/dsssoserver/lib/slf4j-api-1.7.25.jar
--- a/dsssoserver/lib/snappy-java-1.1.7.3.jar
+++ b/dsssoserver/lib/snappy-java-1.1.7.3.jar
--- a/dsssoserver/lib/spotbugs-annotations-3.1.9.jar
+++ b/dsssoserver/lib/spotbugs-annotations-3.1.9.jar
--- a/Show More
+++ b/Show More