diff --git a/.gitignore b/.gitignore index ded2f31..42cf863 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .vs .svn Bin +Bin.Oem NotUse obj *.psd diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index f38c66b..a0eead3 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 鐗堟湰ID /// - public static int VersionCount = 1207; + public static int VersionCount = 1210; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; diff --git a/Bin.Pak/package260528pdd.nsi b/Bin.Pak/package260528pdd.nsi new file mode 100644 index 0000000..0031668 --- /dev/null +++ b/Bin.Pak/package260528pdd.nsi @@ -0,0 +1,150 @@ +; 该脚本使用 HM VNISEdit 脚本编辑器向导产生 + +; 安装程序初始定义常量 +!define PRODUCT_NAME "29供应链-拼多多管理工具" +!define PRODUCT_VERSION "v11.17" +!define PRODUCT_PUBLISHER "29供应链软件制作组" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define BUILD_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\PackTools" +!define BIN_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\Bin" + +SetCompressor lzma + +; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------ +!include "MUI.nsh" + +; MUI 预定义常量 +!define MUI_ABORTWARNING +!define MUI_ICON "${BUILD_PATH}\29pdd.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; 语言选择窗口常量设置 +!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" + +; 欢迎页面 +!insertmacro MUI_PAGE_WELCOME +; 许可协议页面 +!define MUI_LICENSEPAGE_CHECKBOX +!insertmacro MUI_PAGE_LICENSE "${BUILD_PATH}\Licence.txt" +; 安装目录选择页面 +!insertmacro MUI_PAGE_DIRECTORY +; 安装过程页面 +!insertmacro MUI_PAGE_INSTFILES +; 安装完成页面 +;!define MUI_FINISHPAGE_RUN "$INSTDIR\29供应链.exe" +!define MUI_FINISHPAGE_RUN "$INSTDIR\29pdd.lnk" +!insertmacro MUI_PAGE_FINISH + +; 安装卸载过程页面 +!insertmacro MUI_UNPAGE_INSTFILES + +; 安装界面包含的语言设置 +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; 安装预释放文件 +!insertmacro MUI_RESERVEFILE_LANGDLL +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +; ------ MUI 现代界面定义结束 ------ + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "29供应链-拼多多管理工具.exe" +InstallDir "$PROGRAMFILES\29供应链-拼多多管理工具" +InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +ShowInstDetails show +ShowUnInstDetails show +BrandingText "29供应链-拼多多管理工具安装程序" + +Section "MainSection" SEC01 + SetOutPath "$INSTDIR" + ;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件 + SetOverwrite on + ;/x 排除的目录或文件 + ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${BIN_PATH}\*.*" + File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" "${BIN_PATH}\*.*" + CreateDirectory "$SMPROGRAMS\29供应链-拼多多管理工具" + CreateShortCut "$SMPROGRAMS\29供应链-拼多多管理工具\29供应链-拼多多管理工具.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\29pdd.ico" + CreateShortCut "$DESKTOP\29供应链-拼多多管理工具.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\29pdd.ico" + File "${BIN_PATH}\29供应链.exe" + ;SetOutPath "$TEMP" + ;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe" + ;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装 + ;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装 +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\29供应链-拼多多管理工具\Uninstall.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.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\29供应链.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +/****************************** + * 以下是安装程序的卸载部分 * + ******************************/ + +Section Uninstall + Delete "$INSTDIR\uninst.exe" + Delete "$TEMP\vc_redist.x86.exe" + Delete "$INSTDIR\29供应链.exe" + + Delete "$SMPROGRAMS\29供应链-拼多多管理工具\Uninstall.lnk" + Delete "$DESKTOP\29供应链-拼多多管理工具.lnk" + Delete "$SMPROGRAMS\29供应链-拼多多管理工具\29供应链-拼多多管理工具.lnk" + + RMDir "$SMPROGRAMS\29供应链-拼多多管理工具" + + RMDir /r "$INSTDIR\blob_storage" + RMDir /r "$INSTDIR\Cache" + RMDir /r "$INSTDIR\config" + RMDir /r "$INSTDIR\data" + RMDir /r "$INSTDIR\DawnCache" + RMDir /r "$INSTDIR\GPUCache" + RMDir /r "$INSTDIR\locales" + RMDir /r "$INSTDIR\log" + RMDir /r "$INSTDIR\ru-ru" + RMDir /r "$INSTDIR\static" + RMDir /r "$INSTDIR\taobao" + RMDir /r "$INSTDIR\temp" + RMDir /r "$INSTDIR\upBak" + RMDir /r "$INSTDIR\upTemp" + RMDir /r "$INSTDIR\x64" + RMDir /r "$INSTDIR\x86" + + RMDir /r "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function un.onInit +!insertmacro MUI_UNGETLANGUAGE + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2 + Abort +FunctionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。" +FunctionEnd diff --git a/Bin.Pak/package260701wx x64.nsi b/Bin.Pak/package260701wx x64.nsi new file mode 100644 index 0000000..e0c2d76 --- /dev/null +++ b/Bin.Pak/package260701wx x64.nsi @@ -0,0 +1,187 @@ +; 该脚本使用 HM VNISEdit 脚本编辑器向导产生 + +; 安装程序初始定义常量 +!define PRODUCT_NAME "29供应链-微信小店管理工具" +!define PRODUCT_VERSION "v12.02" +!define PRODUCT_PUBLISHER "29供应链软件制作组" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;需要管理员权限 +!define PRODUCT_UNINST_ROOT_KEY "HKCU" +!define BUILD_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\PackTools" +!define BIN_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\Bin" + +SetCompressor lzma + +; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------ +!include "MUI.nsh" + +; MUI 预定义常量 +!define MUI_ABORTWARNING +!define MUI_ICON "${BUILD_PATH}\29wx.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; 语言选择窗口常量设置 +!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" + +; 欢迎页面 +!insertmacro MUI_PAGE_WELCOME +; 许可协议页面 +!define MUI_LICENSEPAGE_CHECKBOX +!insertmacro MUI_PAGE_LICENSE "${BUILD_PATH}\Licence.txt" +; 安装目录选择页面 +!insertmacro MUI_PAGE_DIRECTORY +; 安装过程页面 +!insertmacro MUI_PAGE_INSTFILES +; 安装完成页面 +;!define MUI_FINISHPAGE_RUN "$INSTDIR\29供应链.exe" ;win10直接启动会双开，以下改为使用函数启动 +;!define MUI_FINISHPAGE_RUN "exe_file" ;指定要运行的可执行文件路径（如 $INSTDIR\MyApp.exe）。文件名含空格时无需加引号 。 +;!define MUI_FINISHPAGE_RUN_TEXT "text" ;设置复选框旁的显示文本（例如：“立即运行我的应用”）。 +;!define MUI_FINISHPAGE_RUN_PARAMETERS "params" ;传入运行参数。若参数含双引号，需用 \" 转义 。 +;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;默认不选中该复选框（即默认不运行）。 +;!define MUI_FINISHPAGE_RUN_FUNCTION "func_name" ;替代直接运行 exe，改为调用自定义 NSIS 函数（此时 MUI_FINISHPAGE_RUN 可不带参数），适合需执行多步逻辑的场景 。 +;示例================================================================================================================ +;!include "MUI2.nsh" + +;!define MUI_FINISHPAGE_RUN "$INSTDIR\MyApp.exe" +;!define MUI_FINISHPAGE_RUN_TEXT "启动应用程序" +;!define MUI_FINISHPAGE_RUN_PARAMETERS "/silent" +;;!define MUI_FINISHPAGE_RUN_NOTCHECKED + +;!insertmacro MUI_PAGE_FINISH +;示例结束============================================================================================================ + +!define MUI_FINISHPAGE_RUN +;安装函数定义 +!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchExe" +!insertmacro MUI_PAGE_FINISH + +; 安装卸载过程页面 +!insertmacro MUI_UNPAGE_INSTFILES + +; 安装界面包含的语言设置 +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; 安装预释放文件 +!insertmacro MUI_RESERVEFILE_LANGDLL +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +; ------ MUI 现代界面定义结束 ------ + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "29供应链-微信小店管理工具.exe" +InstallDir "$PROGRAMFILES\29供应链-微信小店管理工具" +;InstallDir "D:\29供应链-微信小店管理工具" +;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" +ShowInstDetails show +ShowUnInstDetails show +BrandingText "29供应链-微信小店管理工具安装程序" + +Section "MainSection" SEC01 + SetOutPath "$INSTDIR" + ;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件 + SetOverwrite on + ;/x 排除的目录或文件 + ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${BIN_PATH}\*.*" + File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29pdd.lnk" /x "29pdd.ico" "${BIN_PATH}\*.*" + CreateDirectory "$SMPROGRAMS\29供应链-微信小店管理工具" + CreateShortCut "$SMPROGRAMS\29供应链-微信小店管理工具\29供应链-微信小店管理工具.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\29wx.ico" + CreateShortCut "$DESKTOP\29供应链-微信小店管理工具.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\29wx.ico" + File "${BIN_PATH}\29供应链.exe" + ;SetOutPath "$TEMP" + ;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe" + ;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装 + ;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装 +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\29供应链-微信小店管理工具\Uninstall.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + ;WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe" + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.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\29供应链.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +;function要写字section之后 +Function LaunchExe + ;ExecShell "" "$INSTDIR\${PRODUCT_NAME}.exe" + ; 启动主程序，ExecWait 会等待程序启动后再继续（推荐用于确保启动成功） + ;ExecWait '"$INSTDIR\YourApp.exe"' // 等待也可以用来弹出必要组件安装时等待安装完成再继续运行安装程序。 + ; 若希望安装程序立即关闭而不等待，可使用 Exec + ;Exec '"$INSTDIR\29供应链.exe"' + Exec "$INSTDIR\29供应链.exe" + ; 以普通用户权限启动程序（即使安装包是管理员权限） + ;System::Call 'shell32::ShellExecute(i 0, t"open", t"explorer.exe", t"/e,$INSTDIR\start.bat", t"", i 0)' + ;Exec "$INSTDIR\start.bat" +FunctionEnd + + +/****************************** + * 以下是安装程序的卸载部分 * + ******************************/ + +Section Uninstall + Delete "$INSTDIR\uninst.exe" + Delete "$TEMP\vc_redist.x86.exe" + Delete "$INSTDIR\29供应链.exe" + + Delete "$SMPROGRAMS\29供应链-微信小店管理工具\Uninstall.lnk" + Delete "$DESKTOP\29供应链-微信小店管理工具.lnk" + Delete "$SMPROGRAMS\29供应链-微信小店管理工具\29供应链-微信小店管理工具.lnk" + + RMDir "$SMPROGRAMS\29供应链-微信小店管理工具" + + RMDir /r "$INSTDIR\blob_storage" + RMDir /r "$INSTDIR\Cache" + RMDir /r "$INSTDIR\config" + RMDir /r "$INSTDIR\data" + RMDir /r "$INSTDIR\DawnCache" + RMDir /r "$INSTDIR\GPUCache" + RMDir /r "$INSTDIR\locales" + RMDir /r "$INSTDIR\log" + RMDir /r "$INSTDIR\ru-ru" + RMDir /r "$INSTDIR\static" + RMDir /r "$INSTDIR\taobao" + RMDir /r "$INSTDIR\temp" + RMDir /r "$INSTDIR\upBak" + RMDir /r "$INSTDIR\upTemp" + RMDir /r "$INSTDIR\x64" + RMDir /r "$INSTDIR\x86" + + RMDir /r "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + ;DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function un.onInit +!insertmacro MUI_UNGETLANGUAGE + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2 + Abort +FunctionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。" +FunctionEnd diff --git a/Bin.Pak/package260701寮鸿儨绉戞妧 x64.nsi b/Bin.Pak/package260701寮鸿儨绉戞妧 x64.nsi new file mode 100644 index 0000000..3d84ee8 --- /dev/null +++ b/Bin.Pak/package260701寮鸿儨绉戞妧 x64.nsi @@ -0,0 +1,187 @@ +; 该脚本使用 HM VNISEdit 脚本编辑器向导产生 + +; 安装程序初始定义常量 +!define PRODUCT_NAME "强胜科技" +!define PRODUCT_VERSION "v12.09" +;!define PRODUCT_PUBLISHER "${PRODUCT_NAME}软件制作组" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;需要管理员权限 +!define PRODUCT_UNINST_ROOT_KEY "HKCU" +!define BUILD_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\PackTools" +!define BIN_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\Bin" + +SetCompressor lzma + +; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------ +!include "MUI.nsh" + +; MUI 预定义常量 +!define MUI_ABORTWARNING +!define MUI_ICON "${BUILD_PATH}\favicon.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; 语言选择窗口常量设置 +!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" + +; 欢迎页面 +!insertmacro MUI_PAGE_WELCOME +; 许可协议页面 +!define MUI_LICENSEPAGE_CHECKBOX +!insertmacro MUI_PAGE_LICENSE "${BUILD_PATH}\Licence.txt" +; 安装目录选择页面 +!insertmacro MUI_PAGE_DIRECTORY +; 安装过程页面 +!insertmacro MUI_PAGE_INSTFILES +; 安装完成页面 +;!define MUI_FINISHPAGE_RUN "$INSTDIR\29供应链.exe" ;win10直接启动会双开，以下改为使用函数启动 +;!define MUI_FINISHPAGE_RUN "exe_file" ;指定要运行的可执行文件路径（如 $INSTDIR\MyApp.exe）。文件名含空格时无需加引号 。 +;!define MUI_FINISHPAGE_RUN_TEXT "text" ;设置复选框旁的显示文本（例如：“立即运行我的应用”）。 +;!define MUI_FINISHPAGE_RUN_PARAMETERS "params" ;传入运行参数。若参数含双引号，需用 \" 转义 。 +;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;默认不选中该复选框（即默认不运行）。 +;!define MUI_FINISHPAGE_RUN_FUNCTION "func_name" ;替代直接运行 exe，改为调用自定义 NSIS 函数（此时 MUI_FINISHPAGE_RUN 可不带参数），适合需执行多步逻辑的场景 。 +;示例================================================================================================================ +;!include "MUI2.nsh" + +;!define MUI_FINISHPAGE_RUN "$INSTDIR\MyApp.exe" +;!define MUI_FINISHPAGE_RUN_TEXT "启动应用程序" +;!define MUI_FINISHPAGE_RUN_PARAMETERS "/silent" +;;!define MUI_FINISHPAGE_RUN_NOTCHECKED + +;!insertmacro MUI_PAGE_FINISH +;示例结束============================================================================================================ + +!define MUI_FINISHPAGE_RUN +;安装函数定义 +!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchExe" +!insertmacro MUI_PAGE_FINISH + +; 安装卸载过程页面 +!insertmacro MUI_UNPAGE_INSTFILES + +; 安装界面包含的语言设置 +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; 安装预释放文件 +!insertmacro MUI_RESERVEFILE_LANGDLL +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +; ------ MUI 现代界面定义结束 ------ + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "${PRODUCT_NAME} ${PRODUCT_VERSION}.exe" +InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" +;InstallDir "D:\${PRODUCT_NAME}" +;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" +ShowInstDetails show +ShowUnInstDetails show +BrandingText "${PRODUCT_NAME}安装程序" + +Section "MainSection" SEC01 + SetOutPath "$INSTDIR" + ;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件 + SetOverwrite on + ;/x 排除的目录或文件 + ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${BIN_PATH}\*.*" + File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" /x "29pdd.lnk" /x "29pdd.ico" "${BIN_PATH}\*.*" + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico" + CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico" + File "${BIN_PATH}\29供应链.exe" + ;SetOutPath "$TEMP" + ;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe" + ;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装 + ;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装 +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + ;WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe" + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.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\29供应链.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_NAME}软件制作组" +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +;function要写字section之后 +Function LaunchExe + ;ExecShell "" "$INSTDIR\${PRODUCT_NAME}.exe" + ; 启动主程序，ExecWait 会等待程序启动后再继续（推荐用于确保启动成功） + ;ExecWait '"$INSTDIR\YourApp.exe"' // 等待也可以用来弹出必要组件安装时等待安装完成再继续运行安装程序。 + ; 若希望安装程序立即关闭而不等待，可使用 Exec + ;Exec '"$INSTDIR\29供应链.exe"' + Exec "$INSTDIR\29供应链.exe" + ; 以普通用户权限启动程序（即使安装包是管理员权限） + ;System::Call 'shell32::ShellExecute(i 0, t"open", t"explorer.exe", t"/e,$INSTDIR\start.bat", t"", i 0)' + ;Exec "$INSTDIR\start.bat" +FunctionEnd + + +/****************************** + * 以下是安装程序的卸载部分 * + ******************************/ + +Section Uninstall + Delete "$INSTDIR\uninst.exe" + Delete "$TEMP\vc_redist.x86.exe" + Delete "$INSTDIR\29供应链.exe" + + Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" + Delete "$DESKTOP\${PRODUCT_NAME}.lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" + + RMDir "$SMPROGRAMS\${PRODUCT_NAME}" + + RMDir /r "$INSTDIR\blob_storage" + RMDir /r "$INSTDIR\Cache" + RMDir /r "$INSTDIR\config" + RMDir /r "$INSTDIR\data" + RMDir /r "$INSTDIR\DawnCache" + RMDir /r "$INSTDIR\GPUCache" + RMDir /r "$INSTDIR\locales" + RMDir /r "$INSTDIR\log" + RMDir /r "$INSTDIR\ru-ru" + RMDir /r "$INSTDIR\static" + RMDir /r "$INSTDIR\taobao" + RMDir /r "$INSTDIR\temp" + RMDir /r "$INSTDIR\upBak" + RMDir /r "$INSTDIR\upTemp" + RMDir /r "$INSTDIR\x64" + RMDir /r "$INSTDIR\x86" + + RMDir /r "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + ;DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--# + +Function un.onInit +!insertmacro MUI_UNGETLANGUAGE + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2 + Abort +FunctionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。" +FunctionEnd diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs index 554a823..3a81869 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs @@ -940,18 +940,17 @@ namespace KJD_Web.BLL.WXXD return "{\"code\":999,\"msg\":\"鏍￠獙澶辫触\"}"; var qrcode_base64 = (RegexUtils.GetStringQuery(ref inputData, "qrcode_base64")?.Replace("'", "\\'")); + var agent_code = (RegexUtils.GetStringQuery(ref inputData, "agent_code")?.Replace("'", "\\'")).ParseToString(); string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "UPDATE wxxd.user_top_up_qrcode SET qrcode_base64='" + qrcode_base64 + "' WHERE id=1;"; + //string sql = "UPDATE wxxd.user_top_up_qrcode SET qrcode_base64='" + qrcode_base64 + "' WHERE agent_code=" + agent_code + ";"; + string sql = "INSERT INTO wxxd.user_top_up_qrcode (agent_code,qrcode_base64) VALUES('" + agent_code + "','" + qrcode_base64 + "')" + + "ON DUPLICATE KEY UPDATE agent_code=VALUES(agent_code),qrcode_base64=VALUES(qrcode_base64);"; var rst = mySql.ExecuteAffectedRows(sql); mySql.Close(); - if (string.IsNullOrEmpty(mySql.Message)) - { - return "{\"code\":200}"; - } if (!string.IsNullOrEmpty(mySql.Message)) { return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; @@ -961,7 +960,7 @@ namespace KJD_Web.BLL.WXXD } /// - /// 鍏呭间簩缁寸爜 + /// 鑾峰彇鍏呭间簩缁寸爜 /// /// /// @@ -972,9 +971,11 @@ namespace KJD_Web.BLL.WXXD if (!GetSign(inputData)) return "{\"code\":999,\"msg\":\"鏍￠獙澶辫触\"}"; + var agent_code = (RegexUtils.GetStringQuery(ref inputData, "agent_code")?.Replace("'", "\\'")).ParseToString(); + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "SELECT qrcode_base64 from wxxd.user_top_up_qrcode WHERE id = 1;"; + string sql = "SELECT qrcode_base64 from wxxd.user_top_up_qrcode WHERE agent_code = '" + agent_code + "';"; var qrcode_base64 = mySql.ExecuteFirst(sql); mySql.Close(); diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj.user b/KJDService/KJD_WebService/KJD_WebService.csproj.user index 4bcdc04..c789fae 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj.user +++ b/KJDService/KJD_WebService/KJD_WebService.csproj.user @@ -1,4 +1,4 @@ - +锘 true diff --git a/PackTools/package260701寮鸿儨绉戞妧 x64.nsi b/PackTools/package260701寮鸿儨绉戞妧 x64.nsi index 53f6c4f..3d84ee8 100644 --- a/PackTools/package260701寮鸿儨绉戞妧 x64.nsi +++ b/PackTools/package260701寮鸿儨绉戞妧 x64.nsi @@ -2,8 +2,8 @@ ; 安装程序初始定义常量 !define PRODUCT_NAME "强胜科技" -!define PRODUCT_VERSION "v12.08" -;!define PRODUCT_PUBLISHER "强胜科技软件制作组" +!define PRODUCT_VERSION "v12.09" +;!define PRODUCT_PUBLISHER "${PRODUCT_NAME}软件制作组" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" ;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;需要管理员权限 @@ -71,14 +71,14 @@ SetCompressor lzma ; ------ MUI 现代界面定义结束 ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "强胜科技.exe" -InstallDir "$PROGRAMFILES\强胜科技" -;InstallDir "D:\强胜科技" +OutFile "${PRODUCT_NAME} ${PRODUCT_VERSION}.exe" +InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" +;InstallDir "D:\${PRODUCT_NAME}" ;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" ShowInstDetails show ShowUnInstDetails show -BrandingText "强胜科技安装程序" +BrandingText "${PRODUCT_NAME}安装程序" Section "MainSection" SEC01 SetOutPath "$INSTDIR" @@ -87,9 +87,9 @@ Section "MainSection" SEC01 ;/x 排除的目录或文件 ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${BIN_PATH}\*.*" File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" /x "29pdd.lnk" /x "29pdd.ico" "${BIN_PATH}\*.*" - CreateDirectory "$SMPROGRAMS\强胜科技" - CreateShortCut "$SMPROGRAMS\强胜科技\强胜科技.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico" - CreateShortCut "$DESKTOP\强胜科技.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico" + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico" + CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico" File "${BIN_PATH}\29供应链.exe" ;SetOutPath "$TEMP" ;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe" @@ -99,7 +99,7 @@ SectionEnd Section -AdditionalIcons SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\强胜科技\Uninstall.lnk" "$INSTDIR\uninst.exe" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post @@ -142,11 +142,11 @@ Section Uninstall Delete "$TEMP\vc_redist.x86.exe" Delete "$INSTDIR\29供应链.exe" - Delete "$SMPROGRAMS\强胜科技\Uninstall.lnk" - Delete "$DESKTOP\强胜科技.lnk" - Delete "$SMPROGRAMS\强胜科技\强胜科技.lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" + Delete "$DESKTOP\${PRODUCT_NAME}.lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" - RMDir "$SMPROGRAMS\强胜科技" + RMDir "$SMPROGRAMS\${PRODUCT_NAME}" RMDir /r "$INSTDIR\blob_storage" RMDir /r "$INSTDIR\Cache" diff --git a/TEMUKJD/29_common_icon.ico b/TEMUKJD/29_common_icon_purple.ico similarity index 100% rename from TEMUKJD/29_common_icon.ico rename to TEMUKJD/29_common_icon_purple.ico diff --git a/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs b/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs index 7718826..4cd08d3 100644 --- a/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs +++ b/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs @@ -108,7 +108,7 @@ // pbLogo // this.pbLogo.BackColor = System.Drawing.Color.Transparent; - this.pbLogo.Image = global::TemuKJD.Properties.Resources.icon; + this.pbLogo.Image = global::TemuKJD.Properties.Resources.common_icon; this.pbLogo.Location = new System.Drawing.Point(5, 4); this.pbLogo.Name = "pbLogo"; this.pbLogo.Size = new System.Drawing.Size(23, 23); diff --git a/TEMUKJD/InitForm.cs b/TEMUKJD/InitForm.cs index 8b9c927..49b2b64 100644 --- a/TEMUKJD/InitForm.cs +++ b/TEMUKJD/InitForm.cs @@ -1,4 +1,5 @@ 锘縰sing AllBase; +using NaiBa.Util.Extension; using NaiBa.Util.Helper; using System; using System.Collections.Generic; @@ -22,12 +23,15 @@ namespace TemuKJD { InitializeComponent(); + if (BaseClass.AgentCode.IsNullOrEmpty()) + this.ShowIcon = false; this.Load += NewInitForm_Load; } private void NewInitForm_Load(object sender, EventArgs e) { - this.Icon = BaseClass.Ico; + //if (!BaseClass.AgentCode.IsNullOrEmpty()) + // this.Icon = BaseClass.Ico; //if (!BaseClass.AgentCode.IsNullOrEmpty()) // this.Hide(); diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index f1fa6c5..83d46cf 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -1927,13 +1927,17 @@ - + + - + + + + diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 2b8022c..c351b4a 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace TemuKJD.Properties { // 绫婚氳繃绫讳技浜 ResGen 鎴 Visual Studio 鐨勫伐鍏疯嚜鍔ㄧ敓鎴愮殑銆 // 鑻ヨ娣诲姞鎴栫Щ闄ゆ垚鍛橈紝璇风紪杈 .ResX 鏂囦欢锛岀劧鍚庨噸鏂拌繍琛 ResGen // (浠 /str 浣滀负鍛戒护閫夐」)锛屾垨閲嶆柊鐢熸垚 VS 椤圭洰銆 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -60,6 +60,16 @@ namespace TemuKJD.Properties { } } + /// + /// 鏌ユ壘绫讳技浜 (鍥炬爣) 鐨 System.Drawing.Icon 绫诲瀷鐨勬湰鍦板寲璧勬簮銆 + /// + internal static System.Drawing.Icon _29_common_icon_purple { + get { + object obj = ResourceManager.GetObject("_29_common_icon_purple", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + /// /// 鏌ユ壘绫讳技 @charset "utf-8"; /// @@ -210,6 +220,16 @@ namespace TemuKJD.Properties { } } + /// + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆 + /// + internal static System.Drawing.Bitmap common_icon { + get { + object obj = ResourceManager.GetObject("common_icon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 鏌ユ壘绫讳技 [{"id":0,"name":"鍏ㄩ儴鍒嗙被","parent_cid":-1,"level":0,"enable":0,"is_leaf":false,"industry_status":0,"extra":null,"is_get_child":true},{"id":20005,"name":"濂宠","parent_cid":0,"level":1,"enable":1,"is_leaf":false,"industry_status":0,"extra":null,"is_get_child":true},{"id":20009,"name":"鐢疯","parent_cid":0,"level":1,"enable":1,"is_leaf":false,"industry_status":0,"extra":null,"is_get_child":true},{"id":20062,"name":"鍐呰。瑁よ","parent_cid":0,"level":1,"enable":1,"is_leaf":false,"industry_status":0,"extra":null,"is_get_chi [瀛楃涓茬殑鍏朵綑閮ㄥ垎琚埅鏂璢"; 鐨勬湰鍦板寲瀛楃涓层 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index 58183d9..711f2a6 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -157,6 +157,9 @@ ..\Resources\close.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\common_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\static\dycategorys.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 @@ -448,6 +451,9 @@ ..\resources\weixin_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\29_common_icon_purple.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\static\base.css;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 diff --git a/TEMUKJD/Resources/common_icon.ico b/TEMUKJD/Resources/common_icon.ico index e3ef173..b436bae 100644 Binary files a/TEMUKJD/Resources/common_icon.ico and b/TEMUKJD/Resources/common_icon.ico differ diff --git a/TEMUKJD/Resources/common_icon.png b/TEMUKJD/Resources/common_icon.png new file mode 100644 index 0000000..ab95ea5 Binary files /dev/null and b/TEMUKJD/Resources/common_icon.png differ diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.cs index 4db5284..896bf0d 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.cs @@ -87,6 +87,8 @@ namespace TemuKJD.WXForms.AdminForms var base64Str = BaseRegex.GetStringJson(ref html, "qrcode_base64"); if (!string.IsNullOrEmpty(base64Str)) pictureBox1.Image = Base64ChangeImgUrl.Base64ToImage(base64Str); + else + pictureBox1.Image = Properties.Resources.nopic; } } diff --git a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs index cf47ba3..7b8c738 100644 --- a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs +++ b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs @@ -45,6 +45,8 @@ namespace TemuKJD.WXForms.ShopForms var base64Str = BaseRegex.GetStringJson(ref html, "qrcode_base64"); if (!string.IsNullOrEmpty(base64Str)) pictureBox1.Image = Base64ChangeImgUrl.Base64ToImage(base64Str); + else + pictureBox1.Image = Properties.Resources.nopic; })); } } diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index 389ed8f..666eba5 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -268,10 +268,13 @@ namespace Work // "&company_id=" + BaseClass.CompanyId + "&company=" + GetHtml.UrlEncodeUtf8(BaseClass.CompanyName) + // "&user_name=" + BaseClass.UserName + "&user_key=" + BaseClass.UserKey + "&mobile=" + BaseClass.Mobile + // "&sid=" + shopId + "&shop=" + GetHtml.UrlEncodeUtf8(shopName); - var sign = "time=" + time + "&code=" + time1 + "&code_version=1" + "&version=" + BaseClass.VersionCount + - "&company_id=" + BaseClass.CompanyId + "&company=" + GetHtml.UrlEncodeUtf8(BaseClass.CompanyName) + - "&user_name=" + BaseClass.UserName + "&user_key=" + BaseClass.UserKey + "&mobile=" + BaseClass.Mobile + - "&sid=" + shopId + "&shop=" + GetHtml.UrlEncodeUtf8(shopName) + "&path=" + BaseClass.MainPath; + var sign = "time=" + time + "&code=" + time1 + "&code_version=1" + "&version=" + BaseClass.VersionCount + + "&user_name=" + BaseClass.UserName + "&path=" + BaseClass.MainPath; + if (!BaseClass.AgentCode.IsNullOrEmpty()) + { + sign += "&agent_code=" + BaseClass.AgentCode; + sign += "&agent_name=" + BaseClass.AgentName; + } return sign; }