Explorar o código

安装包做好了

zhangyang %!s(int64=6) %!d(string=hai) anos
pai
achega
0d3258135c

+ 7 - 0
bin/Win32/Debug/setup/listen.txt

@@ -0,0 +1,7 @@
+1.本软件为智铺子收银软件,主要有外卖接单、收银、会员等功能;
+
+2.本软件的所有权归深圳市迅享智慧云科技有限公司,任何人不得对本软件进行破解与反编译等侵犯软件著作权的行为;
+
+3.本协议的最终解释权归深圳市迅享智慧云科技有限公司所有
+
+乐外卖官网 http://www.zhipuzi.com/

BIN=BIN
bin/Win32/Debug/setup/welcome.bmp


BIN=BIN
bin/Win32/Debug/setup/zhipuzi.ico


BIN=BIN
bin/Win32/Debug/setup/zhipuzi_pos_windows_1.1.0.0.exe


+ 123 - 0
bin/Win32/Debug/setup/智铺子收银软件安装脚本.nsi

@@ -0,0 +1,123 @@
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "智铺子收银软件"
+!define PRODUCT_VERSION "1.1.0.0"
+!define PRODUCT_PUBLISHER "深圳市迅享智慧云科技有限公司"
+!define PRODUCT_WEB_SITE "https://www.zhipuzi.com"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKCU"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "zhipuzi.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "listen.txt"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\zhipuzi_pos_windows.exe"
+!define MUI_FINISHPAGE_SHOWREADME
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION autostart
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "开机自动启动"
+!insertmacro MUI_PAGE_FINISH
+
+Function autostart
+WriteRegStr HKCU Software\Microsoft\Windows\CurrentVersion\Run 智铺子收银软件 "$INSTDIR\zhipuzi_pos_windows.exe"
+Functionend
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "SimpChinese"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "zhipuzi_pos_windows_${PRODUCT_VERSION}.exe"
+InstallDir "$PROGRAMFILES\zhipuzi_pos_windows"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Section "MainSection" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+  
+  File /r "..\zhipuzi_pos_windows\*"
+SectionEnd
+
+Section -AdditionalIcons
+  WriteIniStr "$INSTDIR\智铺子官网.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+  
+  ;桌面快捷方式的文件
+  CreateShortCut "$DESKTOP\智铺子收银软件.lnk" "$INSTDIR\zhipuzi_pos_windows.exe"
+  CreateShortCut "$DESKTOP\智铺子官网.lnk" "$INSTDIR\智铺子官网.url" "" "$INSTDIR\icon\zhipuzi.ico"
+  
+  ;开始程序里面的文件
+  CreateDirectory "$SMPROGRAMS\智铺子收银软件"
+  CreateShortCut "$SMPROGRAMS\智铺子收银软件\智铺子收银软件.lnk" "$INSTDIR\zhipuzi_pos_windows.exe"
+  CreateShortCut "$SMPROGRAMS\智铺子收银软件\智铺子官网.lnk" "$INSTDIR\智铺子官网.url" "" "$INSTDIR\icon\zhipuzi.ico"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\智铺子收银软件\卸载.lnk" "$INSTDIR\uninst.exe"
+  
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\zhipuzi_pos_windows.exe"
+  
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\zhipuzi_pos_windows.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从你的计算机移除。"
+FunctionEnd
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "你确实要完全移除 $(^Name) ,其及所有的组件?" IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall  
+  RMDir /r "$INSTDIR"
+
+  Delete "$DESKTOP\智铺子收银软件.lnk"
+  Delete "$DESKTOP\智铺子官网.lnk"
+  
+  SetShellVarContext current
+  Delete "$SMPROGRAMS\智铺子收银软件\卸载.lnk"
+  Delete "$SMPROGRAMS\智铺子收银软件\智铺子官网.lnk"
+  Delete "$SMPROGRAMS\智铺子收银软件\智铺子收银软件.lnk"
+  RMDir "$SMPROGRAMS\智铺子收银软件"
+  
+  SetShellVarContext all
+  Delete "$SMPROGRAMS\智铺子收银软件\卸载.lnk"
+  Delete "$SMPROGRAMS\智铺子收银软件\智铺子官网.lnk"
+  Delete "$SMPROGRAMS\智铺子收银软件\智铺子收银软件.lnk"
+  RMDir "$SMPROGRAMS\智铺子收银软件"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "智铺子收银软件"
+  SetAutoClose true
+SectionEnd

BIN=BIN
bin/Win32/Debug/zhipuzi_pos_windows/db/pos.db


BIN=BIN
bin/Win32/Debug/zhipuzi_pos_windows/icon/zhipuzi.ico


BIN=BIN
bin/Win32/Debug/zhipuzi_pos_windows/zhipuzi_pos_windows.exe


+ 7 - 26
bin/Win32/Debug/zhipuzi_pos_windows_server/conf/zhipuzi_pos_windows_server.conf

@@ -1,34 +1,15 @@
 #这个是调度中心的配置文件,“#"用来注释当前行
 
 #模式,debug或者release
-mode = debug
+mode = release
 
-#release环境的数据库参数
-release_host = rdsqnuyurqnuyur.mysql.rds.aliyuncs.com
-release_port = 3306
-release_username = liantongxue
-release_password = LewaimaiLongtailiDB200
-release_dbname = dispatch
+#debug环境的队列参数
+debug_pos_task_queue = prod-windows-pos-push
 
 #release环境的队列参数
-release_pos_task_queue = zhipuzi-pos-windows-release
-
-#debug环境的数据库参数
-debug_host = rm-bp113vj32hrp7wpws.mysql.rds.aliyuncs.com
-debug_port = 3306
-debug_username = weixin
-debug_password = hhyz122131
-debug_dbname = dispatch
-
-#debug环境的队列参数
-debug_pos_task_queue = zhipuzi-pos-windows-dev
+release_pos_task_queue = prod-windows-pos-push
 
 #连接阿里云的mns需要用到的参数
-#mns.accountendpoint = https://1733013318510961.mns.cn-hangzhou.aliyuncs.com/
-#mns.accesskeyid = LTAIpYffXvFnEUzp
-#mns.accesskeysecret = F3lqBxo6Uj9pJpLs7btMW5u30X5uKB
-
-#乐外卖的
-mns.accountendpoint = https://1111769578085953.mns.cn-hangzhou.aliyuncs.com/
-mns.accesskeyid = 2HUnzc9XJV92PjvW
-mns.accesskeysecret = 20mMc8wuzlfC0r323b6oJqxlBPEyjW
+mns.accountendpoint = https://1733013318510961.mns.cn-hangzhou.aliyuncs.com/
+mns.accesskeyid = LTAIpYffXvFnEUzp
+mns.accesskeysecret = F3lqBxo6Uj9pJpLs7btMW5u30X5uKB

BIN=BIN
bin/Win32/Debug/zhipuzi_pos_windows_server/zhipuzi_pos_windows_server.exe


BIN=BIN
dll/debug/icon.ico


BIN=BIN
res/icon/zhipuzi.ico


BIN=BIN
res/music/new_wamai_order.wav


BIN=BIN
zhipuzi_pos_windows/resource/zhipuzi_pos_windows.aps


BIN=BIN
zhipuzi_pos_windows/resource/zhipuzi_pos_windows.rc


+ 1 - 1
zhipuzi_pos_windows/tool/CSetting.cpp

@@ -184,7 +184,7 @@ void CSetting::Init()
 	std::string setting_is_auto_login = "setting_is_auto_login";
 	if (m_paramsMap.find(setting_is_auto_login) == m_paramsMap.end())
 	{
-		m_paramsMap[setting_is_auto_login] = "1";
+		m_paramsMap[setting_is_auto_login] = "0";
 	}
 
 	std::string setting_is_remember_password = "setting_is_remember_password";

+ 6 - 1
zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -142,8 +142,13 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     </Link>
     <PostBuildEvent>
       <Command>mkdir $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
+mkdir $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\music\
+mkdir $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\icon\
 copy $(TargetPath) $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
-copy $(SolutionDir)dll\debug\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</Command>
+copy $(SolutionDir)dll\debug\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\
+copy $(SolutionDir)res\music\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\music\
+copy $(SolutionDir)res\icon\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\icon\
+</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+ 0 - 0
zhipuzi_pos_windows_server/obj/x86/Release/zhipuzi_.e085afd9.tlog/unsuccessfulbuild


+ 2 - 0
zhipuzi_pos_windows_server/obj/x86/Release/zhipuzi_.e085afd9.tlog/zhipuzi_pos_windows_server_linux.lastbuildstate

@@ -0,0 +1,2 @@
+#TargetFrameworkVersion=:PlatformToolSet=Remote_GCC_1_0:EnableManagedIncrementalBuild=:VCToolArchitecture=:WindowsTargetPlatformVersion=
+Release|x86|E:\work\code\zhipuzi_pos_windows\|

+ 3 - 2
zhipuzi_pos_windows_server/obj/x86/Release/zhipuzi_pos_windows_server_linux.log

@@ -1,2 +1,3 @@
-  Cleaning remote project directory
-D:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCTargets\Application Type\Linux\1.0\Linux.targets(210,6): error : Could not connect to the remote system. Please verify your connection settings, and that your machine is on the network and reachable.
+  Validating sources
+  Copying sources remotely to '172.16.1.71'
+D:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCTargets\Application Type\Linux\1.0\Linux.targets(162,5): error : Could not connect to the remote system. Please verify your connection settings, and that your machine is on the network and reachable.