Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lwqtest1 #20

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed DB_Backup/Target/demo_back.sql
Empty file.
31 changes: 0 additions & 31 deletions DB_Backup/mysql_backup.bat

This file was deleted.

11 changes: 0 additions & 11 deletions DB_Backup/mysql_table_backup.sql

This file was deleted.

18 changes: 9 additions & 9 deletions config/config.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<weSync>
<weSync>
<status>
<lastSyncTime>2016-05-27 09:53:00</lastSyncTime>
<lastKeepTime>10.125</lastKeepTime>
<successTime>35</successTime>
<failTime>9</failTime>
<failTime>11</failTime>
</status>
<database>
<from>
<type>SQL Server</type>
<host>127.0.0.1</host>
<name>TEST_2017</name>
<user></user>
<password></password>
<user/>
<password/>
</from>
<to>
<type>MySQL</type>
<host>localhost</host>
<name>TEST_2017_M</name>
<user></user>
<password></password>
<user/>
<password/>
</to>
</database>
<schedule>
Expand All @@ -32,10 +32,10 @@
<autoBak>true</autoBak>
<debugMode>false</debugMode>
<strictMode>false</strictMode>
<mysqlPath>D:\MySQL</mysqlPath>
<productname>产品A,产品B</productname>
<mysqlPath>C:\Users\Administrator\Desktop\test5\</mysqlPath>
<productname>产品A,产品B</productname>
</setting>
<increase>
<POSITION_CODE>0</POSITION_CODE>
<POSITION_CODE>0</POSITION_CODE>
</increase>
</weSync>
Binary file added config/vivoReportTemplate.xlsx
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/config/zh-cn.properties
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ds.ui.status.progress.current=\u5F53\u524D\u8FDB\u5EA6\uFF1A
ds.ui.status.progress.total=\u672C\u6B21\u603B\u8FDB\u5EA6\uFF1A
ds.ui.status.from=\u6765\u6E90\uFF1ASQL Server/
ds.ui.status.to=\u76EE\u6807\uFF1AMySQL/
ds.ui.status.lastSync=\u4E0A\u4E00\u6B21\u540C\u6B65\u65F6\u95F4\uFF1A
ds.ui.status.lastSync=\uFF1A
ds.ui.status.keepTime=\u6301\u7EED\u65F6\u95F4\uFF1A
ds.ui.status.second=\u79D2
ds.ui.status.successTimes=\u6210\u529F\u603B\u6B21\u6570
Expand Down
Empty file removed log_SQL/log_sql.csv
Empty file.
132 changes: 112 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,26 @@
<version>${logback.version}</version>
</dependency>

<dependency>
<groupId>com.giffing.easyxml</groupId>
<artifactId>easyxml-jdom2</artifactId>
<version>0.0.7</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.poi</groupId>-->
<!-- <artifactId>poi-ooxml</artifactId>-->
<!-- <version>3.8</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.poi</groupId>-->
<!-- <artifactId>poi-scratchpad</artifactId>-->
<!-- <version>3.8</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>com.vdurmont</groupId>
<artifactId>emoji-java</artifactId>
Expand Down Expand Up @@ -86,8 +106,88 @@
<version>${pinyin4j.version}</version>
</dependency>

<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<scope>compile</scope>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<scope>compile</scope>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<scope>compile</scope>
<version>2.0b4</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>compile</scope>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<scope>compile</scope>
<version>2.1.3</version>
</dependency>


</dependencies>

<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <version>3.6.1</version>-->
<!-- <configuration>-->
<!-- <source>1.8</source>-->
<!-- <target>1.8</target>-->
<!-- <encoding>UTF-8</encoding>-->
<!-- </configuration>-->
<!-- </plugin>-->

<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-jar-plugin</artifactId>-->
<!-- <version>2.6</version>-->
<!-- <configuration>-->
<!-- <archive>-->
<!-- <manifest>-->
<!-- <addClasspath>true</addClasspath>-->
<!-- <classpathPrefix>lib/</classpathPrefix>-->
<!-- <mainClass>com.luoboduner.wesync.App</mainClass>-->
<!-- </manifest>-->
<!-- </archive>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-dependency-plugin</artifactId>-->
<!-- <version>2.10</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>copy-dependencies</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>copy-dependencies</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <outputDirectory>${project.build.directory}/lib</outputDirectory>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->


<build>
<plugins>
<plugin>
Expand All @@ -103,36 +203,28 @@

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>com.luoboduner.wesync.App</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
<goal>single</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<archive>
<manifest>
<mainClass>
com.luoboduner.wesync.App
</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
Binary file removed screen_shot/WeSync.png
Binary file not shown.
Binary file removed screen_shot/图像 030.png
Binary file not shown.
Binary file removed screen_shot/图像 031.png
Binary file not shown.
Binary file removed screen_shot/图像 032.png
Binary file not shown.
Binary file removed screen_shot/图像 033.png
Binary file not shown.
Binary file removed screen_shot/图像 034.png
Binary file not shown.
Binary file removed screen_shot/图像 035.png
Binary file not shown.
7 changes: 0 additions & 7 deletions snaps/role.csv

This file was deleted.

5 changes: 0 additions & 5 deletions snaps/role_before.csv

This file was deleted.

6 changes: 0 additions & 6 deletions snaps/user.csv

This file was deleted.

6 changes: 0 additions & 6 deletions snaps/user_before.csv

This file was deleted.

7 changes: 0 additions & 7 deletions snaps_bak/role.csv

This file was deleted.

5 changes: 0 additions & 5 deletions snaps_bak/role_before.csv

This file was deleted.

6 changes: 0 additions & 6 deletions snaps_bak/user.csv

This file was deleted.

6 changes: 0 additions & 6 deletions snaps_bak/user_before.csv

This file was deleted.

3 changes: 3 additions & 0 deletions src/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: com.luoboduner.wesync.App

Loading