Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/ScreenshotVO.java

@@ -14,4 +14,5 @@ import org.springframework.web.multipart.MultipartFile;
 public class ScreenshotVO extends Screenshot {
     private MultipartFile file;
     private String processList;
+    private String osType;//操作系统类型
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -57,7 +57,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
     @Value(value = "${upload.path}")
     private String path;
     @Value(value = "${picrecongnize.path}")
-    private static String picrecongnizeFolder;
+    private String picrecongnizeFolder;
 
     @Value("classpath:novel_words.data")
     private org.springframework.core.io.Resource novelWords;
@@ -161,8 +161,18 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
         } else if (isDocument(textContents)) {
             screenshot.setPicType(2);//看文档
         } else {
+            List<String> exeprocessList = new ArrayList<String>();
+            if ("Q_OS_WIN".equals(screenshotvo.getOsType())) {
+                exeprocessList = ProcessUtil.getWinExeprocessListfromProcessStr(screenshotvo.getProcessList());
+            } else if ("Q_OS_LINUX".equals(screenshotvo.getOsType())
+                        ||"Q_OS_MAC".equals(screenshotvo.getOsType())) {
+                exeprocessList = ProcessUtil.getWinExeprocessListfromProcessStr(screenshotvo.getProcessList());
+            } else {
+                HttpRespMsg msg = new HttpRespMsg();
+                msg.setError("请求缺少操作系统类型, 只支持Q_OS_WIN，Q_OS_LINUX， Q_OS_MAC ");
+                return msg;
+            }
 
-            List<String> exeprocessList = ProcessUtil.getExeprocessListfromProcessStr(screenshotvo.getProcessList());
             boolean derail = false;//判断是否匹配的开关
             Integer lastType = null;
             for (String textContent : textContents) {
@@ -520,10 +530,8 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
     }
 
     //判断是否是浏览器
-    private static String isBrowser(File pic) throws Exception {
-        if (picrecongnizeFolder == null) {
-            picrecongnizeFolder = "C:\\picrecongnize";
-        }
+    private String isBrowser(File pic) throws Exception {
+        System.out.println("picrecongnizeFolder=="+picrecongnizeFolder);
         File folder = new File(picrecongnizeFolder);
         if (!folder.exists()) {
             throw new Exception("没有设置图片上传的浏览器比对模板库");

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application-prod.yml

@@ -13,9 +13,9 @@ spring:
       max-request-size: 10000MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://118.190.47.230:3306/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.100.37.243:7644/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: p011430seya1026
+    password: Hssx2018.!
     hikari:
       maximum-pool-size: 10
       minimum-idle: 3
@@ -53,7 +53,8 @@ logging:
     org.springframework.web: trace
     #打印sql语句
     com.management.platform.mapper: debug
-  path: E:/
+  path: /log/
+  file: worktime.log
 ##########
 mybatis-plus:
   #  mapper-locations: classpath:mapper/*/*.xml
@@ -79,7 +80,8 @@ mybatis:
   mapper-locations: mappers/*Mapper.xml
 #####配置图片上传路径####
 upload:
-  path: E:/staticproject/timesheet/upload/
-
+  path: /www/staticproject/timesheet/upload/
+picrecongnize:
+  path: /www/webapps/worktime/picrecongnize/
 
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ScreenshotMapper.xml

@@ -30,7 +30,7 @@
         GROUP BY uid
         ) AS b
         ON a.uid = b.uid AND a.indate = b.max_indate
-        LEFT JOIN USER AS c
+        LEFT JOIN user AS c
         ON a.uid = c.id
         WHERE 1=1
         <if test="companyId != null and companyId != ''">

fhKeeper/formulahousekeeper/mywork/home.cpp

@@ -17,8 +17,8 @@
 #include "httpapi.h"
 #include "qresource.h"
 
-#include <windows.h>
-#include <tlhelp32.h>
+//#include <windows.h>
+//#include <tlhelp32.h>
 #include <stdio.h>
 #pragma execution_character_set("utf-8")
 Home::Home(QWidget *parent) :
@@ -32,7 +32,7 @@ Home::Home(QWidget *parent) :
             captureScreen();
     });
     myTimer->start(10000);
-
+    setWindowTitle(tr("智能工时管家"));
     //set ui data
     webWidget = new QWebEngineView(this);
     QNetworkProxyFactory::setUseSystemConfiguration(false);
@@ -50,79 +50,9 @@ Home::Home(QWidget *parent) :
   qs->beginGroup("user");
   QString id = qs->value("id").toString();
   qDebug() << "id=="<<id<<", phone="<<qs->value("name").toString();
-  QString str = "http://118.190.47.230:9092/#/desktop/" + id;
+  QString str = "http://47.100.37.243:9092/#/desktop/" + id;
   loadNavigate(str);
 
-
-  HANDLE hCurrentCursor = GetForegroundWindow();
-  qDebug()<<hCurrentCursor<<endl;
-//  EnumWindows(StaticEnumWindowsProc,reinterpret_cast<LPARAM>(this));
-  PROCESSENTRY32 pe32;
-  //再使用这个结构体前先定义它的大小
-  pe32.dwSize=sizeof(pe32);
-  //给系统内的所有进程拍一个快照
-  HANDLE hProcessSnap=::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS,0);
-  if (hProcessSnap==INVALID_HANDLE_VALUE)
-  {
-    printf("Create ToolHelp32Snaphhot调用失败!\n");
-
-  }
-  BOOL bMore=::Process32First(hProcessSnap,&pe32);
-
-  ::CloseHandle(hProcessSnap);
-
-}
-
-BOOL Home::StaticEnumWindowsProc(HWND hwnd, LPARAM lParam)
-{
-    //窗口是否可视
-    if (!::IsWindowVisible(hwnd))
-        return TRUE;
-
-    //窗口是否可激活
-    if (!::IsWindowEnabled(hwnd))
-        return TRUE;
-
-    //确定给定窗口是否是最小化（图标化）的窗口。
-    //if(IsIconic(hwnd))
-      //  return TRUE;
-
-    //窗口是否具有父窗口？
-    HWND hParent = (HWND)GetWindowLong(hwnd, -8);
-    //父窗口是否可激活？
-    //据 Spy++ 观察，如“运行”对话框等被应列入列表的程序有一个隐藏的，具有 WS_DISABLED 的父窗口
-    if (IsWindowEnabled(hParent))
-        return TRUE;
-    //父窗口是否可视？
-    if (IsWindowVisible(hParent))
-        return TRUE;
-
-    LONG gwl_style = GetWindowLong(hwnd, GWL_STYLE);
-    if ((gwl_style & WS_POPUP) && !(gwl_style & WS_CAPTION))
-        return TRUE;
-
-    CHAR caption[256];
-    memset(caption, 0, sizeof(caption));
-    ::GetWindowTextA(hwnd, caption, 255);
-
-    if (strcmp(caption, ""))
-    {
-        if (GetClassLong(hwnd, -14))
-        {
-            HICON hIcon =(HICON)GetClassLong(hwnd, -14);
-            if(hIcon)
-            {
-//                handleIcon.push_back(hIcon);
-//                handleWindow.push_back(hwnd);
-                qDebug()<<"hIcon="<<hIcon<<", title="<<GetClassLong(hwnd, -8);
-
-            }
-        }
-    } else {
-        qDebug() <<"title=="<< caption;
-    }
-
-    return TRUE;
 }
 
 
@@ -210,20 +140,49 @@ void Home::captureScreen() {
     textPart2.setBody(indate.toUtf8());
     multiPart->append(textPart2);
 
+
     QString processList = getProcessList();
-//    qDebug() << processList ;
+    qDebug() << processList;
     QHttpPart textPart3;
     textPart3.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"processList\""));
     textPart3.setBody(processList.toUtf8());
     multiPart->append(textPart3);
 
+    //add os infomation
+    QString osType = "";
+    #if defined(Q_OS_WIN)
+    osType = "Q_OS_WIN";
+    #endif
+    #if defined(Q_OS_MAC)
+    osType = "Q_OS_MAC";
+    #endif
+    #if defined(Q_OS_LINUX)
+    osType = "Q_OS_LINUX";
+    #endif
+    qDebug() << "osType=="<<osType;
+    QHttpPart textPart4;
+    textPart4.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"osType\""));
+    textPart4.setBody(osType.toUtf8());
+    multiPart->append(textPart4);
+
     QNetworkAccessManager *m_pNetWorkManager = new QNetworkAccessManager();
     m_pNetWorkManager->post(request, multiPart);
 }
 
 QString Home::getProcessList() {
     QProcess process;
+    #ifdef Q_OS_WIN
+    qDebug() <<"This is Windows platform";
     process.start("tasklist.exe");
+    #endif
+    #ifdef Q_OS_MAC
+    qDebug() <<"This is Mac platform, run ps aux";
+    process.start("ps aux");
+    #endif
+    #ifdef Q_OS_LINUX
+    qDebug() <<"This is Linux platform, run ps aux";
+    process.start("ps aux");
+    #endif
     if(process.waitForFinished())
     {
         QByteArray result = process.readAll();
@@ -244,7 +203,7 @@ void Home::closeEvent ( QCloseEvent * e )
 {
     if( QMessageBox::question(this,
                              tr("退出"),
-                             tr("您确定要退出吗?"),
+                             tr("退出软件将无法统计到您的工时，影响绩效，您确定要退出吗?"),
                               QMessageBox::Yes, QMessageBox::No )
                    == QMessageBox::Yes){
         e->accept();//不会将事件传递给组件的父组件

fhKeeper/formulahousekeeper/mywork/home.h

@@ -4,7 +4,7 @@
 #include <QMainWindow>
 #include <QTimer>
 #include <QtWebEngineWidgets>
-#include "Windows.h"
+//#include "Windows.h"
 #define GWL_HWNDPARENT = -8
 #define GCL_HICON = -14
 #define GCL_MENUNAME = -8
@@ -25,7 +25,7 @@ public slots:
     void captureScreen();
     QString getProcessList();
     void loadNavigate(QString sUrl);
-    static BOOL StaticEnumWindowsProc(HWND hwnd, LPARAM lParam);
+    //static BOOL StaticEnumWindowsProc(HWND hwnd, LPARAM lParam);
 private:
     Ui::Home *ui;
     QTimer *myTimer;

fhKeeper/formulahousekeeper/mywork/httpapi.h

@@ -7,7 +7,7 @@
 #include <QJsonObject>
 #include "baseapi.h"
 //const QString SERVER_URL = QString("http://127.0.0.1:10010");
-const QString SERVER_URL = QString("http://118.190.47.230:10010");
+const QString SERVER_URL = QString("http://47.100.37.243:10010");
 class HttpAPI: public BaseAPI
 {
 public:

fhKeeper/formulahousekeeper/mywork/mainwindow.cpp

@@ -29,29 +29,41 @@ MainWindow::MainWindow(QWidget *parent)
 }
 void MainWindow::login_in(void){//登陆
     //设置url
-    QString username = ui->account->text();
+//    QString username ="15895914665";
+    QString phone =ui->account->text();
+//    QString pwd = "000000";
     QString pwd = ui->pwd->text();
-    QString url = "/user/loginEmployee?username="+username+"&password="+pwd;//fae4b325e52c
+    QString url = "/user/loginEmployee?username="+phone+"&password="+pwd;//fae4b325e52c
+    qDebug() << "url==="<<url;
     HttpAPI *api = new HttpAPI();
     static MainWindow* myWin = this;
+    //先存上手机号密码
+    m_setting->beginGroup("user");
+    m_setting->setValue("phone", phone);
+    m_setting->setValue("pwd", pwd);
+    m_setting->endGroup();
+
     api->getRequest(url, [&](bool success, QJsonObject json){
         if (success)
         {
            //do something
             qDebug()<<"request success==";
-            if (json.value("code").toString() == "ok") {
+            if (json.value("code").toString().compare("ok") == 0)
+            {
+                if(myWin)
                 myWin->close();
                 QJsonObject obj = json.value("data").toObject();
                 m_setting->beginGroup("user");
                 m_setting->setValue("id", obj.value("id"));
                 m_setting->setValue("name", obj.value("name"));
                 m_setting->setValue("phone", obj.value("phone"));
-                m_setting->setValue("pwd", pwd);
                 m_setting->endGroup();
                 //enter home page
                 home = new Home();
                 home->show();
-            } else {
+            }
+            else
+            {
                 QMessageBox msg3(QMessageBox::Information,windowTitle(),json.value("msg").toString(),QMessageBox::Ok,this);
                 msg3.exec();
             }

fhKeeper/formulahousekeeper/mywork/mainwindow.ui

@@ -50,7 +50,7 @@
      </rect>
     </property>
     <property name="text">
-     <string>15900000000</string>
+     <string/>
     </property>
    </widget>
    <widget class="QLineEdit" name="pwd">
@@ -63,12 +63,38 @@
      </rect>
     </property>
     <property name="text">
-     <string>000000</string>
+     <string/>
     </property>
     <property name="echoMode">
      <enum>QLineEdit::Password</enum>
     </property>
    </widget>
+   <widget class="QLabel" name="label_2">
+    <property name="geometry">
+     <rect>
+      <x>230</x>
+      <y>200</y>
+      <width>51</width>
+      <height>61</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>账号</string>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_3">
+    <property name="geometry">
+     <rect>
+      <x>230</x>
+      <y>290</y>
+      <width>51</width>
+      <height>61</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>密码</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">

fhKeeper/formulahousekeeper/mywork/mywork.pro

@@ -37,4 +37,4 @@ FORMS += \
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
-RC_ICONS = myicon.ico
+RC_ICONS = favicon.ico

fhKeeper/formulahousekeeper/mywork/setup.iss

@@ -0,0 +1,45 @@
+; 脚本由 Inno Setup 脚本向导 生成！
+; 有关创建 Inno Setup 脚本文件的详细资料请查阅帮助文档！
+
+#define MyAppName "WorkTime"
+#define MyAppVersion "1.6"
+#define MyAppPublisher "南京火石闪信网络科技有限公司"
+#define MyAppExeName "MyProg.exe"
+
+[Setup]
+; 注: AppId的值为单独标识该应用程序。
+; 不要为其他安装程序使用相同的AppId值。
+; (若要生成新的 GUID，可在菜单中点击 "工具|生成 GUID"。)
+AppId={{C8AD2873-2374-4415-8996-5CDCFF8711BD}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+DefaultDirName={autopf}\{#MyAppName}
+DisableProgramGroupPage=yes
+; 以下行取消注释，以在非管理安装模式下运行（仅为当前用户安装）。
+;PrivilegesRequired=lowest
+OutputDir=C:\Users\seya\Desktop
+OutputBaseFilename=WorkTime
+SetupIconFile=C:\gitproject\manHourHousekeeper\fhKeeper\formulahousekeeper\mywork\favicon.ico
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "C:\Users\seya\Desktop\SmartTimeClient\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; 注意: 不要在任何共享系统文件上使用“Flags: ignoreversion”
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

fhKeeper/formulahousekeeper/mywork/worktime.iss

@@ -0,0 +1,45 @@
+; 脚本由 Inno Setup 脚本向导 生成！
+; 有关创建 Inno Setup 脚本文件的详细资料请查阅帮助文档！
+
+#define MyAppName "WorkTime"
+#define MyAppVersion "1.7"
+#define MyAppPublisher "南京火石闪信网络科技有限公司"
+#define MyAppExeName "MyProg.exe"
+
+[Setup]
+; 注: AppId的值为单独标识该应用程序。
+; 不要为其他安装程序使用相同的AppId值。
+; (若要生成新的 GUID，可在菜单中点击 "工具|生成 GUID"。)
+AppId={{76B50AE8-4AC1-4DDF-9B77-55CEA7C6DDB0}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+DefaultDirName={autopf}\{#MyAppName}
+DisableProgramGroupPage=yes
+; 以下行取消注释，以在非管理安装模式下运行（仅为当前用户安装）。
+;PrivilegesRequired=lowest
+OutputDir=C:\Users\seya\Desktop
+OutputBaseFilename=智能工时管家
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "C:\Users\seya\Desktop\SmartTimeClient\mywork.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\seya\Desktop\SmartTimeClient\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; 注意: 不要在任何共享系统文件上使用“Flags: ignoreversion”
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+