Skip to content

Commit

Permalink
Merge pull request #112 from rememberber/develop
Browse files Browse the repository at this point in the history
3.0
  • Loading branch information
rememberber authored May 16, 2019
2 parents ac60195 + 59c37ce commit c0e7e44
Show file tree
Hide file tree
Showing 147 changed files with 11,010 additions and 5,582 deletions.
22 changes: 21 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
<velocity-engine-core.version>2.1</velocity-engine-core.version>
<lombok.version>1.18.6</lombok.version>
<mybatis.version>3.5.1</mybatis.version>
<sqlite-jdbc.version>3.27.2.1</sqlite-jdbc.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -242,6 +244,16 @@
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>${sqlite-jdbc.version}</version>
</dependency>

</dependencies>

Expand Down Expand Up @@ -447,7 +459,15 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.6</version>
<configuration>
<verbose>true</verbose>
<overwrite>true</overwrite>
</configuration>
</plugin>
</plugins>
</build>
</project>
Binary file modified screen_shoot/图像 198.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screen_shoot/图像 199.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screen_shoot/图像 200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screen_shoot/图像 202.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screen_shoot/图像 204.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screen_shoot/图像 205.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screen_shoot/图像 206.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screen_shoot/图像 207.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion src/main/java/com/fangxuele/tool/push/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.fangxuele.tool.push.ui.form.LoadingForm;
import com.fangxuele.tool.push.ui.form.MainWindow;
import com.fangxuele.tool.push.ui.frame.MainFrame;
import com.fangxuele.tool.push.util.MybatisUtil;
import org.apache.ibatis.session.SqlSession;

import javax.swing.*;

Expand All @@ -18,21 +20,25 @@
public class App {
public static MainFrame mainFrame;

public static SqlSession sqlSession = MybatisUtil.getSqlSession();

public static void main(String[] args) {
Init.initTheme();
mainFrame = new MainFrame();
mainFrame.init();
JPanel loadingPanel = new LoadingForm().getLoadingPanel();
mainFrame.add(loadingPanel);
mainFrame.pack();
mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
mainFrame.setVisible(true);

SwingUtilities.invokeLater(() -> {
mainFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
Init.initGlobalFont();
Init.initAllTab();
Init.initOthers();
mainFrame.setContentPane(MainWindow.mainWindow.mainPanel);
MainWindow.mainWindow.init();
mainFrame.setContentPane(MainWindow.mainWindow.getMainPanel());
mainFrame.addListeners();
mainFrame.remove(loadingPanel);
});
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/com/fangxuele/tool/push/dao/InitMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.fangxuele.tool.push.dao;

/**
* <pre>
* 初始化数据库
* </pre>
*
* @author <a href="https://github.com/rememberber">RememBerBer</a>
* @since 2019/5/9.
*/
public interface InitMapper {
/**
* 初始化创建所有表
*
* @return
*/
int createAllTables();
}
28 changes: 28 additions & 0 deletions src/main/java/com/fangxuele/tool/push/dao/TMsgKefuMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TMsgKefu;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface TMsgKefuMapper {
int deleteByPrimaryKey(Integer id);

int insert(TMsgKefu record);

int insertSelective(TMsgKefu record);

TMsgKefu selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TMsgKefu record);

int updateByPrimaryKey(TMsgKefu record);

List<TMsgKefu> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);

int updateByMsgTypeAndMsgName(TMsgKefu tMsgKefu);

List<TMsgKefu> selectByMsgType(int msgType);

int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TMsgKefuPriority;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface TMsgKefuPriorityMapper {
int deleteByPrimaryKey(Integer id);

int insert(TMsgKefuPriority record);

int insertSelective(TMsgKefuPriority record);

TMsgKefuPriority selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TMsgKefuPriority record);

int updateByPrimaryKey(TMsgKefuPriority record);

List<TMsgKefuPriority> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);

int updateByMsgTypeAndMsgName(TMsgKefuPriority tMsgKefuPriority);

List<TMsgKefuPriority> selectByMsgType(int msgType);

int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TMsgMaTemplate;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface TMsgMaTemplateMapper {
int deleteByPrimaryKey(Integer id);

int insert(TMsgMaTemplate record);

int insertSelective(TMsgMaTemplate record);

TMsgMaTemplate selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TMsgMaTemplate record);

int updateByPrimaryKey(TMsgMaTemplate record);

List<TMsgMaTemplate> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);

int updateByMsgTypeAndMsgName(TMsgMaTemplate tMsgMaTemplate);

List<TMsgMaTemplate> selectByMsgType(int msgType);

int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TMsgMpTemplate;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface TMsgMpTemplateMapper {
int deleteByPrimaryKey(Integer id);

int insert(TMsgMpTemplate record);

int insertSelective(TMsgMpTemplate record);

TMsgMpTemplate selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TMsgMpTemplate record);

int updateByPrimaryKey(TMsgMpTemplate record);

List<TMsgMpTemplate> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);

int updateByMsgTypeAndMsgName(TMsgMpTemplate tMsgMpTemplate);

List<TMsgMpTemplate> selectByMsgType(int msgType);

int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
}
28 changes: 28 additions & 0 deletions src/main/java/com/fangxuele/tool/push/dao/TMsgSmsMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TMsgSms;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface TMsgSmsMapper {
int deleteByPrimaryKey(Integer id);

int insert(TMsgSms record);

int insertSelective(TMsgSms record);

TMsgSms selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TMsgSms record);

int updateByPrimaryKey(TMsgSms record);

List<TMsgSms> selectByMsgTypeAndMsgName(@Param("msgType") int msgType, @Param("msgName") String msgName);

int updateByMsgTypeAndMsgName(TMsgSms tMsgSms);

List<TMsgSms> selectByMsgType(int msgType);

int deleteByMsgTypeAndName(@Param("msgType") int msgType, @Param("msgName") String msgName);
}
21 changes: 21 additions & 0 deletions src/main/java/com/fangxuele/tool/push/dao/TPushHistoryMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TPushHistory;

import java.util.List;

public interface TPushHistoryMapper {
int deleteByPrimaryKey(Integer id);

int insert(TPushHistory record);

int insertSelective(TPushHistory record);

TPushHistory selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TPushHistory record);

int updateByPrimaryKey(TPushHistory record);

List<TPushHistory> selectByMsgType(int msgType);
}
24 changes: 24 additions & 0 deletions src/main/java/com/fangxuele/tool/push/dao/TTemplateDataMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TTemplateData;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface TTemplateDataMapper {
int deleteByPrimaryKey(Integer id);

int insert(TTemplateData record);

int insertSelective(TTemplateData record);

TTemplateData selectByPrimaryKey(Integer id);

int updateByPrimaryKeySelective(TTemplateData record);

int updateByPrimaryKey(TTemplateData record);

List<TTemplateData> selectByMsgTypeAndMsgId(@Param("msgType") int msgType, @Param("msgId") int msgId);

int deleteByMsgTypeAndMsgId(@Param("msgType") int msgType, @Param("msgId") int msgId);
}
19 changes: 19 additions & 0 deletions src/main/java/com/fangxuele/tool/push/dao/TWxMpUserMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.fangxuele.tool.push.dao;

import com.fangxuele.tool.push.domain.TWxMpUser;

public interface TWxMpUserMapper {
int deleteByPrimaryKey(String openId);

int insert(TWxMpUser record);

int insertSelective(TWxMpUser record);

TWxMpUser selectByPrimaryKey(String openId);

int updateByPrimaryKeySelective(TWxMpUser record);

int updateByPrimaryKey(TWxMpUser record);

int deleteAll();
}
Loading

0 comments on commit c0e7e44

Please sign in to comment.