From 40f18764b97b07bed7d308c6d2f0024fc9b90d0d Mon Sep 17 00:00:00 2001 From: gwokwong Date: Thu, 20 Jul 2023 17:42:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/site/en/index.html | 22 +++++++++++++--------- public/site/index.html | 11 +++++++---- public/site/zh/index.html | 12 +++++++----- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/public/site/en/index.html b/public/site/en/index.html index 1ba033c32..0c50112a4 100644 --- a/public/site/en/index.html +++ b/public/site/en/index.html @@ -100,11 +100,14 @@

Lightweight open source online project task management tool to help teams efficiently advance their projects and make work easier.

- - - + + + + + + + -
@@ -417,11 +420,12 @@

Turn on your DooTask team collaboration

- - - - - + + + + + +
diff --git a/public/site/index.html b/public/site/index.html index 3ac3764f7..2e2647d4e 100644 --- a/public/site/index.html +++ b/public/site/index.html @@ -99,11 +99,14 @@

DooTask是一款轻量级的开源在线项目任务管理工具，提供各类文档协作工具、在线思维导图、在线流程图、项目管理、任务分发、即时IM，文件管理等工具。助力团队高效推进项目，让工作更简单。

- - - + + + + + + + -
diff --git a/public/site/zh/index.html b/public/site/zh/index.html index 5b5bdcea8..aa101f435 100644 --- a/public/site/zh/index.html +++ b/public/site/zh/index.html @@ -99,12 +99,14 @@

DooTask是一款轻量级的开源在线项目任务管理工具，提供各类文档协作工具、在线思维导图、在线流程图、项目管理、任务分发、即时IM，文件管理等工具。助力团队高效推进项目，让工作更简单。

- - - + + + + + + + - -
From 3a834ae90d44523c3da1b34f624ccc6bbcc76633 Mon Sep 17 00:00:00 2001 From: spylecym <1262965753@qq.com> Date: Fri, 21 Jul 2023 11:56:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=9A=90?= =?UTF-8?q?=E7=A7=81=E6=94=BF=E7=AD=96=E9=93=BE=E6=8E=A5=E3=80=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=81cookie=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/site/css/common.css | 23 +++++++++ public/site/css/privacy.css | 0 public/site/en/about.html | 8 +++- public/site/en/download.html | 8 +++- public/site/en/help.html | 8 +++- public/site/en/index.html | 34 +++++++++++++- public/site/en/log.html | 6 +++ public/site/en/price.html | 8 +++- public/site/en/privacy.html | 87 +++++++++++++++++++++++++++++++++++ public/site/en/product.html | 8 +++- public/site/en/solutions.html | 8 +++- public/site/index.html | 6 +++ public/site/zh/about.html | 8 +++- public/site/zh/download.html | 8 +++- public/site/zh/help.html | 8 +++- public/site/zh/index.html | 34 +++++++++++++- public/site/zh/log.html | 3 ++ public/site/zh/price.html | 8 +++- public/site/zh/privacy.html | 87 +++++++++++++++++++++++++++++++++++ public/site/zh/product.html | 8 +++- public/site/zh/solutions.html | 8 +++- 21 files changed, 362 insertions(+), 14 deletions(-) create mode 100644 public/site/css/privacy.css create mode 100644 public/site/en/privacy.html create mode 100644 public/site/zh/privacy.html diff --git a/public/site/css/common.css b/public/site/css/common.css index 03d6f4a5c..f075341bf 100644 --- a/public/site/css/common.css +++ b/public/site/css/common.css @@ -983,3 +983,26 @@ footer{ .hide{ display: none; } +#cookieConsent{ + display: none; + width: 100%; + height: 180px; + background-color: rgba(0,0,0,.8); + position: fixed; + bottom: 0; + z-index: 9999; + color: #dfe4e8; + padding: 40px 50px; + box-sizing: border-box; + text-align: center; +} +#agreeButton{ + width: 130px; + position: absolute; + right: 80px; + bottom: 50px; +} +#cookie_a{ + color: #dfe4e8; + text-decoration-line: underline; +} \ No newline at end of file diff --git a/public/site/css/privacy.css b/public/site/css/privacy.css new file mode 100644 index 000000000..e69de29bb diff --git a/public/site/en/about.html b/public/site/en/about.html index febb98aa8..87a48f9dc 100644 --- a/public/site/en/about.html +++ b/public/site/en/about.html @@ -41,6 +41,9 @@
  • Help Center
    • + + +
  • @@ -333,9 +336,12 @@
  • Download Center
    • -
  • +
  • Help Center
    • +
  • + Privacy Policy +
  • diff --git a/public/site/en/download.html b/public/site/en/download.html index 565f6376c..d609d9432 100644 --- a/public/site/en/download.html +++ b/public/site/en/download.html @@ -172,6 +172,9 @@
  • Help Center
    • +
  • + Privacy Policy +
    • Pricing @@ -282,9 +285,12 @@
  • Download Center
    • -
  • +
  • Help Center
    • +
  • + Privacy Policy +
  • diff --git a/public/site/en/help.html b/public/site/en/help.html index 474561e87..943b5d65a 100644 --- a/public/site/en/help.html +++ b/public/site/en/help.html @@ -414,6 +414,9 @@ >Help Center
    • +
  • + Privacy Policy +
    • Download Center -
  • +
  • Help Center
    • +
  • + Privacy Policy +
  • diff --git a/public/site/en/index.html b/public/site/en/index.html index 0c50112a4..d3b520b09 100644 --- a/public/site/en/index.html +++ b/public/site/en/index.html @@ -14,6 +14,11 @@
    + +
    +

    We use cookies (including third-party cookies) for security, technical, analytical and marketing purposes in order to enable our website to serve you properly, to improve security and to operate more efficiently in order to provide you with a better website experience. By continuing to browse this website, you are consenting to the use of cookies; for more information on how we use cookies, please see our 《Privacy Policy》。

    + +
    @@ -146,6 +151,9 @@
  • Help Center
    • +
  • + Privacy Policy +
    • Pricing @@ -467,9 +475,12 @@
  • Download Center
    • -
  • +
  • Help Center
    • +
  • + Privacy Policy +
  • @@ -505,6 +516,27 @@ + \ No newline at end of file diff --git a/public/site/en/privacy.md b/public/site/en/privacy.md new file mode 100644 index 000000000..0eb2b0722 --- /dev/null +++ b/public/site/en/privacy.md @@ -0,0 +1,242 @@ +# Privacy Policy + +Last updated: July 21, 2023 + +This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You. + +We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy. This Privacy Policy has been created with the help of the [Privacy Policy Generator](https://www.termsfeed.com/privacy-policy-generator/). + +# Interpretation and Definitions + +## Interpretation + +The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural. + +## Definitions + +For the purposes of this Privacy Policy: + +- __Account__ means a unique account created for You to access our Service or parts of our Service. +- __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority. + + + +- __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Guangxi Hitosea Information Technology Co., No. 1411, 14/F, Building 1, Wuxiang Hangyang City, Liangqing District, Nanning City, Guangxi Zhuang Autonomous Region, China. + + + +- __Cookies__ are small files that are placed on Your computer, mobile device or any other device by a website, containing the details of Your browsing history on that website among its many uses. + +- __Country__ refers to: China + +- __Device__ means any device that can access the Service such as a computer, a cellphone or a digital tablet. + + + +- __Personal Data__ is any information that relates to an identified or identifiable individual. + + + + +- __Service__ refers to the Website. + +- __Service Provider__ means any natural or legal person who processes the data on behalf of the Company. It refers to third-party companies or individuals employed by the Company to facilitate the Service, to provide the Service on behalf of the Company, to perform services related to the Service or to assist the Company in analyzing how the Service is used. + + +- __Usage Data__ refers to data collected automatically, either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit). + + +- __Website__ refers to DooTask, accessible from [https://www.dootask.com/](https://www.dootask.com/) + +- __You__ means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable. + + + +# Collecting and Using Your Personal Data + +## Types of Data Collected + +### Personal Data + +While using Our Service, We may ask You to provide Us with certain personally identifiable information that can be used to contact or identify You. Personally identifiable information may include, but is not limited to: + + + +- Phone number + + + +- Usage Data + + + +### Usage Data + +Usage Data is collected automatically when using the Service. + +Usage Data may include information such as Your Device's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that You visit, the time and date of Your visit, the time spent on those pages, unique device identifiers and other diagnostic data. + +When You access the Service by or through a mobile device, We may collect certain information automatically, including, but not limited to, the type of mobile device You use, Your mobile device unique ID, the IP address of Your mobile device, Your mobile operating system, the type of mobile Internet browser You use, unique device identifiers and other diagnostic data. + +We may also collect information that Your browser sends whenever You visit our Service or when You access the Service by or through a mobile device. + + + + + + +### Tracking Technologies and Cookies + +We use Cookies and similar tracking technologies to track the activity on Our Service and store certain information. Tracking technologies used are beacons, tags, and scripts to collect and track information and to improve and analyze Our Service. The technologies We use may include: + +- __Cookies or Browser Cookies.__ A cookie is a small file placed on Your Device. You can instruct Your browser to refuse all Cookies or to indicate when a Cookie is being sent. However, if You do not accept Cookies, You may not be able to use some parts of our Service. Unless you have adjusted Your browser setting so that it will refuse Cookies, our Service may use Cookies. +- __Web Beacons.__ Certain sections of our Service and our emails may contain small electronic files known as web beacons (also referred to as clear gifs, pixel tags, and single-pixel gifs) that permit the Company, for example, to count users who have visited those pages or opened an email and for other related website statistics (for example, recording the popularity of a certain section and verifying system and server integrity). + +Cookies can be "Persistent" or "Session" Cookies. Persistent Cookies remain on Your personal computer or mobile device when You go offline, while Session Cookies are deleted as soon as You close Your web browser. You can learn more about cookies on [TermsFeed website](https://www.termsfeed.com/blog/cookies/#What_Are_Cookies) article. + +We use both Session and Persistent Cookies for the purposes set out below: + +- __Necessary / Essential Cookies__ + + Type: Session Cookies + + Administered by: Us + + Purpose: These Cookies are essential to provide You with services available through the Website and to enable You to use some of its features. They help to authenticate users and prevent fraudulent use of user accounts. Without these Cookies, the services that You have asked for cannot be provided, and We only use these Cookies to provide You with those services. +- __Cookies Policy / Notice Acceptance Cookies__ + + Type: Persistent Cookies + + Administered by: Us + + Purpose: These Cookies identify if users have accepted the use of cookies on the Website. +- __Functionality Cookies__ + + Type: Persistent Cookies + + Administered by: Us + + Purpose: These Cookies allow us to remember choices You make when You use the Website, such as remembering your login details or language preference. The purpose of these Cookies is to provide You with a more personal experience and to avoid You having to re-enter your preferences every time You use the Website. + + + +For more information about the cookies we use and your choices regarding cookies, please visit our Cookies Policy or the Cookies section of our Privacy Policy. + + +## Use of Your Personal Data + +The Company may use Personal Data for the following purposes: + +- __To provide and maintain our Service__, including to monitor the usage of our Service. +- __To manage Your Account:__ to manage Your registration as a user of the Service. The Personal Data You provide can give You access to different functionalities of the Service that are available to You as a registered user. +- __For the performance of a contract:__ the development, compliance and undertaking of the purchase contract for the products, items or services You have purchased or of any other contract with Us through the Service. +- __To contact You:__ To contact You by email, telephone calls, SMS, or other equivalent forms of electronic communication, such as a mobile application's push notifications regarding updates or informative communications related to the functionalities, products or contracted services, including the security updates, when necessary or reasonable for their implementation. +- __To provide You__ with news, special offers and general information about other goods, services and events which we offer that are similar to those that you have already purchased or enquired about unless You have opted not to receive such information. +- __To manage Your requests:__ To attend and manage Your requests to Us. + +- __For business transfers:__ We may use Your information to evaluate or conduct a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Our assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which Personal Data held by Us about our Service users is among the assets transferred. +- __For other purposes__: We may use Your information for other purposes, such as data analysis, identifying usage trends, determining the effectiveness of our promotional campaigns and to evaluate and improve our Service, products, services, marketing and your experience. + +We may share Your personal information in the following situations: + +- __With Service Providers:__ We may share Your personal information with Service Providers to monitor and analyze the use of our Service, to contact You. +- __For business transfers:__ We may share or transfer Your personal information in connection with, or during negotiations of, any merger, sale of Company assets, financing, or acquisition of all or a portion of Our business to another company. +- __With Affiliates:__ We may share Your information with Our affiliates, in which case we will require those affiliates to honor this Privacy Policy. Affiliates include Our parent company and any other subsidiaries, joint venture partners or other companies that We control or that are under common control with Us. +- __With business partners:__ We may share Your information with Our business partners to offer You certain products, services or promotions. +- __With other users:__ when You share personal information or otherwise interact in the public areas with other users, such information may be viewed by all users and may be publicly distributed outside. +- __With Your consent__: We may disclose Your personal information for any other purpose with Your consent. + +## Retention of Your Personal Data + +The Company will retain Your Personal Data only for as long as is necessary for the purposes set out in this Privacy Policy. We will retain and use Your Personal Data to the extent necessary to comply with our legal obligations (for example, if we are required to retain your data to comply with applicable laws), resolve disputes, and enforce our legal agreements and policies. + +The Company will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period of time, except when this data is used to strengthen the security or to improve the functionality of Our Service, or We are legally obligated to retain this data for longer time periods. + +## Transfer of Your Personal Data + +Your information, including Personal Data, is processed at the Company's operating offices and in any other places where the parties involved in the processing are located. It means that this information may be transferred to — and maintained on — computers located outside of Your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from Your jurisdiction. + +Your consent to this Privacy Policy followed by Your submission of such information represents Your agreement to that transfer. + +The Company will take all steps reasonably necessary to ensure that Your data is treated securely and in accordance with this Privacy Policy and no transfer of Your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of Your data and other personal information. + +## Delete Your Personal Data + +You have the right to delete or request that We assist in deleting the Personal Data that We have collected about You. + +Our Service may give You the ability to delete certain information about You from within the Service. + +You may update, amend, or delete Your information at any time by signing in to Your Account, if you have one, and visiting the account settings section that allows you to manage Your personal information. You may also contact Us to request access to, correct, or delete any personal information that You have provided to Us. + +Please note, however, that We may need to retain certain information when we have a legal obligation or lawful basis to do so. + +## Disclosure of Your Personal Data + +### Business Transactions + +If the Company is involved in a merger, acquisition or asset sale, Your Personal Data may be transferred. We will provide notice before Your Personal Data is transferred and becomes subject to a different Privacy Policy. + +### Law enforcement + +Under certain circumstances, the Company may be required to disclose Your Personal Data if required to do so by law or in response to valid requests by public authorities (e.g. a court or a government agency). + +### Other legal requirements + +The Company may disclose Your Personal Data in the good faith belief that such action is necessary to: + +- Comply with a legal obligation +- Protect and defend the rights or property of the Company +- Prevent or investigate possible wrongdoing in connection with the Service +- Protect the personal safety of Users of the Service or the public +- Protect against legal liability + +## Security of Your Personal Data + +The security of Your Personal Data is important to Us, but remember that no method of transmission over the Internet, or method of electronic storage is 100% secure. While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security. + + + + + + + + + + + + + + + + + + +# Children's Privacy + +Our Service does not address anyone under the age of 13. We do not knowingly collect personally identifiable information from anyone under the age of 13. If You are a parent or guardian and You are aware that Your child has provided Us with Personal Data, please contact Us. If We become aware that We have collected Personal Data from anyone under the age of 13 without verification of parental consent, We take steps to remove that information from Our servers. + +If We need to rely on consent as a legal basis for processing Your information and Your country requires consent from a parent, We may require Your parent's consent before We collect and use that information. + + +# Links to Other Websites + +Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit. + +We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services. + +# Changes to this Privacy Policy + +We may update Our Privacy Policy from time to time. We will notify You of any changes by posting the new Privacy Policy on this page. + +We will let You know via email and/or a prominent notice on Our Service, prior to the change becoming effective and update the "Last updated" date at the top of this Privacy Policy. + +You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page. + +# Contact Us + +If you have any questions about this Privacy Policy, You can contact us: + + + + +- By phone number: 0771-3164099 \ No newline at end of file diff --git a/public/site/zh/privacy.html b/public/site/zh/privacy.html index 44e0a86fb..47559dc4a 100644 --- a/public/site/zh/privacy.html +++ b/public/site/zh/privacy.html @@ -2,7 +2,7 @@ - DooTask + Privacy @@ -12,76 +12,29 @@ -
    -
    -
    - - -
    -
    - 语言切换 -
      -
    • - 简体中文 -
      • -
    • - English -
      • -
    -
    - - 明亮主题 - - - 暗黑主题 - - - - github - - - - - - - - -
    -
    - 菜单 -
    -
    -
    -
    + +
    + + + \ No newline at end of file diff --git a/public/site/zh/privacy.md b/public/site/zh/privacy.md new file mode 100644 index 000000000..0eb2b0722 --- /dev/null +++ b/public/site/zh/privacy.md @@ -0,0 +1,242 @@ +# Privacy Policy + +Last updated: July 21, 2023 + +This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You. + +We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy. This Privacy Policy has been created with the help of the [Privacy Policy Generator](https://www.termsfeed.com/privacy-policy-generator/). + +# Interpretation and Definitions + +## Interpretation + +The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural. + +## Definitions + +For the purposes of this Privacy Policy: + +- __Account__ means a unique account created for You to access our Service or parts of our Service. +- __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority. + + + +- __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Guangxi Hitosea Information Technology Co., No. 1411, 14/F, Building 1, Wuxiang Hangyang City, Liangqing District, Nanning City, Guangxi Zhuang Autonomous Region, China. + + + +- __Cookies__ are small files that are placed on Your computer, mobile device or any other device by a website, containing the details of Your browsing history on that website among its many uses. + +- __Country__ refers to: China + +- __Device__ means any device that can access the Service such as a computer, a cellphone or a digital tablet. + + + +- __Personal Data__ is any information that relates to an identified or identifiable individual. + + + + +- __Service__ refers to the Website. + +- __Service Provider__ means any natural or legal person who processes the data on behalf of the Company. It refers to third-party companies or individuals employed by the Company to facilitate the Service, to provide the Service on behalf of the Company, to perform services related to the Service or to assist the Company in analyzing how the Service is used. + + +- __Usage Data__ refers to data collected automatically, either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit). + + +- __Website__ refers to DooTask, accessible from [https://www.dootask.com/](https://www.dootask.com/) + +- __You__ means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable. + + + +# Collecting and Using Your Personal Data + +## Types of Data Collected + +### Personal Data + +While using Our Service, We may ask You to provide Us with certain personally identifiable information that can be used to contact or identify You. Personally identifiable information may include, but is not limited to: + + + +- Phone number + + + +- Usage Data + + + +### Usage Data + +Usage Data is collected automatically when using the Service. + +Usage Data may include information such as Your Device's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that You visit, the time and date of Your visit, the time spent on those pages, unique device identifiers and other diagnostic data. + +When You access the Service by or through a mobile device, We may collect certain information automatically, including, but not limited to, the type of mobile device You use, Your mobile device unique ID, the IP address of Your mobile device, Your mobile operating system, the type of mobile Internet browser You use, unique device identifiers and other diagnostic data. + +We may also collect information that Your browser sends whenever You visit our Service or when You access the Service by or through a mobile device. + + + + + + +### Tracking Technologies and Cookies + +We use Cookies and similar tracking technologies to track the activity on Our Service and store certain information. Tracking technologies used are beacons, tags, and scripts to collect and track information and to improve and analyze Our Service. The technologies We use may include: + +- __Cookies or Browser Cookies.__ A cookie is a small file placed on Your Device. You can instruct Your browser to refuse all Cookies or to indicate when a Cookie is being sent. However, if You do not accept Cookies, You may not be able to use some parts of our Service. Unless you have adjusted Your browser setting so that it will refuse Cookies, our Service may use Cookies. +- __Web Beacons.__ Certain sections of our Service and our emails may contain small electronic files known as web beacons (also referred to as clear gifs, pixel tags, and single-pixel gifs) that permit the Company, for example, to count users who have visited those pages or opened an email and for other related website statistics (for example, recording the popularity of a certain section and verifying system and server integrity). + +Cookies can be "Persistent" or "Session" Cookies. Persistent Cookies remain on Your personal computer or mobile device when You go offline, while Session Cookies are deleted as soon as You close Your web browser. You can learn more about cookies on [TermsFeed website](https://www.termsfeed.com/blog/cookies/#What_Are_Cookies) article. + +We use both Session and Persistent Cookies for the purposes set out below: + +- __Necessary / Essential Cookies__ + + Type: Session Cookies + + Administered by: Us + + Purpose: These Cookies are essential to provide You with services available through the Website and to enable You to use some of its features. They help to authenticate users and prevent fraudulent use of user accounts. Without these Cookies, the services that You have asked for cannot be provided, and We only use these Cookies to provide You with those services. +- __Cookies Policy / Notice Acceptance Cookies__ + + Type: Persistent Cookies + + Administered by: Us + + Purpose: These Cookies identify if users have accepted the use of cookies on the Website. +- __Functionality Cookies__ + + Type: Persistent Cookies + + Administered by: Us + + Purpose: These Cookies allow us to remember choices You make when You use the Website, such as remembering your login details or language preference. The purpose of these Cookies is to provide You with a more personal experience and to avoid You having to re-enter your preferences every time You use the Website. + + + +For more information about the cookies we use and your choices regarding cookies, please visit our Cookies Policy or the Cookies section of our Privacy Policy. + + +## Use of Your Personal Data + +The Company may use Personal Data for the following purposes: + +- __To provide and maintain our Service__, including to monitor the usage of our Service. +- __To manage Your Account:__ to manage Your registration as a user of the Service. The Personal Data You provide can give You access to different functionalities of the Service that are available to You as a registered user. +- __For the performance of a contract:__ the development, compliance and undertaking of the purchase contract for the products, items or services You have purchased or of any other contract with Us through the Service. +- __To contact You:__ To contact You by email, telephone calls, SMS, or other equivalent forms of electronic communication, such as a mobile application's push notifications regarding updates or informative communications related to the functionalities, products or contracted services, including the security updates, when necessary or reasonable for their implementation. +- __To provide You__ with news, special offers and general information about other goods, services and events which we offer that are similar to those that you have already purchased or enquired about unless You have opted not to receive such information. +- __To manage Your requests:__ To attend and manage Your requests to Us. + +- __For business transfers:__ We may use Your information to evaluate or conduct a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Our assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which Personal Data held by Us about our Service users is among the assets transferred. +- __For other purposes__: We may use Your information for other purposes, such as data analysis, identifying usage trends, determining the effectiveness of our promotional campaigns and to evaluate and improve our Service, products, services, marketing and your experience. + +We may share Your personal information in the following situations: + +- __With Service Providers:__ We may share Your personal information with Service Providers to monitor and analyze the use of our Service, to contact You. +- __For business transfers:__ We may share or transfer Your personal information in connection with, or during negotiations of, any merger, sale of Company assets, financing, or acquisition of all or a portion of Our business to another company. +- __With Affiliates:__ We may share Your information with Our affiliates, in which case we will require those affiliates to honor this Privacy Policy. Affiliates include Our parent company and any other subsidiaries, joint venture partners or other companies that We control or that are under common control with Us. +- __With business partners:__ We may share Your information with Our business partners to offer You certain products, services or promotions. +- __With other users:__ when You share personal information or otherwise interact in the public areas with other users, such information may be viewed by all users and may be publicly distributed outside. +- __With Your consent__: We may disclose Your personal information for any other purpose with Your consent. + +## Retention of Your Personal Data + +The Company will retain Your Personal Data only for as long as is necessary for the purposes set out in this Privacy Policy. We will retain and use Your Personal Data to the extent necessary to comply with our legal obligations (for example, if we are required to retain your data to comply with applicable laws), resolve disputes, and enforce our legal agreements and policies. + +The Company will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period of time, except when this data is used to strengthen the security or to improve the functionality of Our Service, or We are legally obligated to retain this data for longer time periods. + +## Transfer of Your Personal Data + +Your information, including Personal Data, is processed at the Company's operating offices and in any other places where the parties involved in the processing are located. It means that this information may be transferred to — and maintained on — computers located outside of Your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from Your jurisdiction. + +Your consent to this Privacy Policy followed by Your submission of such information represents Your agreement to that transfer. + +The Company will take all steps reasonably necessary to ensure that Your data is treated securely and in accordance with this Privacy Policy and no transfer of Your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of Your data and other personal information. + +## Delete Your Personal Data + +You have the right to delete or request that We assist in deleting the Personal Data that We have collected about You. + +Our Service may give You the ability to delete certain information about You from within the Service. + +You may update, amend, or delete Your information at any time by signing in to Your Account, if you have one, and visiting the account settings section that allows you to manage Your personal information. You may also contact Us to request access to, correct, or delete any personal information that You have provided to Us. + +Please note, however, that We may need to retain certain information when we have a legal obligation or lawful basis to do so. + +## Disclosure of Your Personal Data + +### Business Transactions + +If the Company is involved in a merger, acquisition or asset sale, Your Personal Data may be transferred. We will provide notice before Your Personal Data is transferred and becomes subject to a different Privacy Policy. + +### Law enforcement + +Under certain circumstances, the Company may be required to disclose Your Personal Data if required to do so by law or in response to valid requests by public authorities (e.g. a court or a government agency). + +### Other legal requirements + +The Company may disclose Your Personal Data in the good faith belief that such action is necessary to: + +- Comply with a legal obligation +- Protect and defend the rights or property of the Company +- Prevent or investigate possible wrongdoing in connection with the Service +- Protect the personal safety of Users of the Service or the public +- Protect against legal liability + +## Security of Your Personal Data + +The security of Your Personal Data is important to Us, but remember that no method of transmission over the Internet, or method of electronic storage is 100% secure. While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security. + + + + + + + + + + + + + + + + + + +# Children's Privacy + +Our Service does not address anyone under the age of 13. We do not knowingly collect personally identifiable information from anyone under the age of 13. If You are a parent or guardian and You are aware that Your child has provided Us with Personal Data, please contact Us. If We become aware that We have collected Personal Data from anyone under the age of 13 without verification of parental consent, We take steps to remove that information from Our servers. + +If We need to rely on consent as a legal basis for processing Your information and Your country requires consent from a parent, We may require Your parent's consent before We collect and use that information. + + +# Links to Other Websites + +Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit. + +We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services. + +# Changes to this Privacy Policy + +We may update Our Privacy Policy from time to time. We will notify You of any changes by posting the new Privacy Policy on this page. + +We will let You know via email and/or a prominent notice on Our Service, prior to the change becoming effective and update the "Last updated" date at the top of this Privacy Policy. + +You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page. + +# Contact Us + +If you have any questions about this Privacy Policy, You can contact us: + + + + +- By phone number: 0771-3164099 \ No newline at end of file From 68e8c4bb598ccb846024e2d435507fb03a5da3f5 Mon Sep 17 00:00:00 2001 From: gwokwong Date: Fri, 21 Jul 2023 18:21:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/site/zh/privacy.md | 217 +++++++++++++++++++------------------- 1 file changed, 109 insertions(+), 108 deletions(-) diff --git a/public/site/zh/privacy.md b/public/site/zh/privacy.md index 0eb2b0722..f12fd1883 100644 --- a/public/site/zh/privacy.md +++ b/public/site/zh/privacy.md @@ -1,200 +1,199 @@ -# Privacy Policy +# 隐私政策 -Last updated: July 21, 2023 +最后更新 2023 年 7 月 21 日 -This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You. +本隐私政策描述了我们在您使用本服务时收集、使用和披露您的信息的政策和程序，并向您介绍了您的隐私权以及法律如何保护您。 -We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy. This Privacy Policy has been created with the help of the [Privacy Policy Generator](https://www.termsfeed.com/privacy-policy-generator/). +我们使用您的个人数据来提供和改进服务。使用本服务即表示您同意我们按照本隐私政策收集和使用信息。本隐私政策在[隐私政策生成器](https://www.termsfeed.com/privacy-policy-generator/)的帮助下创建。 -# Interpretation and Definitions +# 解释和定义 -## Interpretation +##释义 -The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural. +首字母大写的词语在以下情况下具有定义的含义。以下定义具有相同含义，无论其为单数还是复数。 -## Definitions +## 定义 -For the purposes of this Privacy Policy: +在本隐私政策中： -- __Account__ means a unique account created for You to access our Service or parts of our Service. -- __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority. +- __账户__是指为您访问我们的服务或我们服务的部分内容而创建的唯一账户。 +- __关联方__系指控制一方、受一方控制或与一方受共同控制的实体，其中 "控制 "系指拥有 50%或 50%以上有权投票选举董事或其他管理权的股份、股权或其他证券。 -- __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Guangxi Hitosea Information Technology Co., No. 1411, 14/F, Building 1, Wuxiang Hangyang City, Liangqing District, Nanning City, Guangxi Zhuang Autonomous Region, China. +- __公司__（在本协议中称为 "本公司"、"我们"、"我们的 "或 "我们的"）是指广西海通盛世信息技术有限公司，地址为中国广西壮族自治区南宁市良庆区五象瀚洋城 1 号楼 14 层 1411 号。 -- __Cookies__ are small files that are placed on Your computer, mobile device or any other device by a website, containing the details of Your browsing history on that website among its many uses. +- __Cookies__是网站放置在您的计算机、移动设备或任何其他设备上的小文件，其中包含您在该网站上的详细浏览记录及其他多种用途。 -- __Country__ refers to: China +- __国家__是指 中国 -- __Device__ means any device that can access the Service such as a computer, a cellphone or a digital tablet. +- __设备__是指可以访问本服务的任何设备，如计算机、手机或数字平板电脑。 -- __Personal Data__ is any information that relates to an identified or identifiable individual. +- __个人数据__是指与已识别或可识别的个人有关的任何信息。 -- __Service__ refers to the Website. +- __服务__系指本网站。 -- __Service Provider__ means any natural or legal person who processes the data on behalf of the Company. It refers to third-party companies or individuals employed by the Company to facilitate the Service, to provide the Service on behalf of the Company, to perform services related to the Service or to assist the Company in analyzing how the Service is used. - +- __服务提供商__系指代表本公司处理数据的任何自然人或法人。它指公司雇用的第三方公司或个人，以促进服务、代表公司提供服务、执行与服务有关的服务或协助公司分析服务的使用情况。 -- __Usage Data__ refers to data collected automatically, either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit). +- __使用数据__系指自动收集的数据，这些数据可以是使用本服务时产生的，也可以是本服务基础设施本身产生的（例如，访问页面的持续时间）。 -- __Website__ refers to DooTask, accessible from [https://www.dootask.com/](https://www.dootask.com/) -- __You__ means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable. +- 网站__是指 DooTask，可从 [https://www.dootask.com/](https://www.dootask.com/)访问。 +- __您__指访问或使用本服务的个人，或该个人访问或使用本服务所代表的公司或其他法人实体（如适用）。 -# Collecting and Using Your Personal Data -## Types of Data Collected +# 收集和使用您的个人数据 -### Personal Data +## 收集的数据类型 -While using Our Service, We may ask You to provide Us with certain personally identifiable information that can be used to contact or identify You. Personally identifiable information may include, but is not limited to: +### 个人数据 +在使用我们的服务时，我们可能会要求您向我们提供某些可用于联系或识别您身份的个人身份信息。个人身份信息可能包括但不限于 -- Phone number +- 电话号码 -- Usage Data +- 使用数据 -### Usage Data -Usage Data is collected automatically when using the Service. -Usage Data may include information such as Your Device's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that You visit, the time and date of Your visit, the time spent on those pages, unique device identifiers and other diagnostic data. +#### 使用数据 -When You access the Service by or through a mobile device, We may collect certain information automatically, including, but not limited to, the type of mobile device You use, Your mobile device unique ID, the IP address of Your mobile device, Your mobile operating system, the type of mobile Internet browser You use, unique device identifiers and other diagnostic data. +使用数据是在使用服务时自动收集的。 -We may also collect information that Your browser sends whenever You visit our Service or when You access the Service by or through a mobile device. +使用数据可能包括以下信息：您设备的互联网协议地址（如 IP 地址）、浏览器类型、浏览器版本、您访问的服务页面、访问时间和日期、在这些页面上花费的时间、唯一设备标识符和其他诊断数据。 +当您使用或通过移动设备访问本服务时，我们可能会自动收集某些信息，包括但不限于您使用的移动设备类型、您的移动设备唯一 ID、您的移动设备 IP 地址、您的移动操作系统、您使用的移动互联网浏览器类型、唯一设备标识符和其他诊断数据。 +当您访问我们的服务时，或者当您通过移动设备访问服务时，我们也会收集您的浏览器发送的信息。 -### Tracking Technologies and Cookies -We use Cookies and similar tracking technologies to track the activity on Our Service and store certain information. Tracking technologies used are beacons, tags, and scripts to collect and track information and to improve and analyze Our Service. The technologies We use may include: -- __Cookies or Browser Cookies.__ A cookie is a small file placed on Your Device. You can instruct Your browser to refuse all Cookies or to indicate when a Cookie is being sent. However, if You do not accept Cookies, You may not be able to use some parts of our Service. Unless you have adjusted Your browser setting so that it will refuse Cookies, our Service may use Cookies. -- __Web Beacons.__ Certain sections of our Service and our emails may contain small electronic files known as web beacons (also referred to as clear gifs, pixel tags, and single-pixel gifs) that permit the Company, for example, to count users who have visited those pages or opened an email and for other related website statistics (for example, recording the popularity of a certain section and verifying system and server integrity). +###跟踪技术和 Cookie -Cookies can be "Persistent" or "Session" Cookies. Persistent Cookies remain on Your personal computer or mobile device when You go offline, while Session Cookies are deleted as soon as You close Your web browser. You can learn more about cookies on [TermsFeed website](https://www.termsfeed.com/blog/cookies/#What_Are_Cookies) article. +我们使用 Cookie 和类似的跟踪技术来跟踪我们服务上的活动并存储某些信息。跟踪技术包括信标、标签和脚本，用于收集和跟踪信息以及改进和分析我们的服务。我们使用的技术可能包括 -We use both Session and Persistent Cookies for the purposes set out below: +- Cookie 或浏览器 Cookie 是放置在您设备上的一个小文件。您可以指示您的浏览器拒绝所有 Cookie 或在发送 Cookie 时进行提示。但是，如果您不接受 Cookie，您可能无法使用我们服务的某些部分。除非您已将浏览器设置调整为拒绝 Cookie，否则我们的服务可能会使用 Cookie。 +- 本公司服务的某些部分和本公司的电子邮件可能包含称为网站信标（也称为透明 gifs、像素标签和单像素 gifs）的小型电子文件，这些电子文件允许本公司对访问过这些页面或打开过电子邮件的用户进行计数，并用于其他相关的网站统计（例如，记录特定部分的受欢迎程度以及验证系统和服务器的完整性）。 -- __Necessary / Essential Cookies__ +Cookie 可以是 "持久 "或 "会话 "Cookie。永久 Cookie 会在您离线后保留在您的个人电脑或移动设备上，而 Session Cookie 会在您关闭网络浏览器后立即删除。您可以在[TermsFeed 网站](https://www.termsfeed.com/blog/cookies/#What_Are_Cookies) 文章中了解有关 Cookie 的更多信息。 - Type: Session Cookies +我们使用会话 Cookie 和永久 Cookie 的目的如下： - Administered by: Us +- __必要/基本 Cookie__ - Purpose: These Cookies are essential to provide You with services available through the Website and to enable You to use some of its features. They help to authenticate users and prevent fraudulent use of user accounts. Without these Cookies, the services that You have asked for cannot be provided, and We only use these Cookies to provide You with those services. -- __Cookies Policy / Notice Acceptance Cookies__ + 类型： 会话 Cookie - Type: Persistent Cookies + 管理者： 我们 - Administered by: Us + 目的：这些 Cookies 对于通过本网站向您提供服务以及使您能够使用本网站的某些功能至关重要。它们有助于验证用户身份，防止用户账户被冒用。如果没有这些 Cookies，您所要求的服务将无法提供，而我们使用这些 Cookies 只是为了向您提供这些服务。 +- __Cookies政策/通知接受Cookies__ - Purpose: These Cookies identify if users have accepted the use of cookies on the Website. -- __Functionality Cookies__ + 类型： 持久 Cookie - Type: Persistent Cookies + 管理者 我们 - Administered by: Us + 目的：这些 Cookie 可识别用户是否接受本网站使用 Cookie。 +- 功能 Cookies - Purpose: These Cookies allow us to remember choices You make when You use the Website, such as remembering your login details or language preference. The purpose of these Cookies is to provide You with a more personal experience and to avoid You having to re-enter your preferences every time You use the Website. + 类型 持久 Cookie + 管理者： 我们 + 目的：这些 Cookies 允许我们记住您在使用本网站时所作的选择，例如记住您的登录信息或语言偏好。这些 Cookies 的目的是为您提供更加个性化的体验，避免您每次使用网站时都要重新输入您的偏好。 -For more information about the cookies we use and your choices regarding cookies, please visit our Cookies Policy or the Cookies section of our Privacy Policy. -## Use of Your Personal Data +有关我们使用的 Cookie 以及您对 Cookie 的选择的更多信息，请访问我们的 Cookie 政策或隐私政策中的 Cookie 部分。 -The Company may use Personal Data for the following purposes: -- __To provide and maintain our Service__, including to monitor the usage of our Service. -- __To manage Your Account:__ to manage Your registration as a user of the Service. The Personal Data You provide can give You access to different functionalities of the Service that are available to You as a registered user. -- __For the performance of a contract:__ the development, compliance and undertaking of the purchase contract for the products, items or services You have purchased or of any other contract with Us through the Service. -- __To contact You:__ To contact You by email, telephone calls, SMS, or other equivalent forms of electronic communication, such as a mobile application's push notifications regarding updates or informative communications related to the functionalities, products or contracted services, including the security updates, when necessary or reasonable for their implementation. -- __To provide You__ with news, special offers and general information about other goods, services and events which we offer that are similar to those that you have already purchased or enquired about unless You have opted not to receive such information. -- __To manage Your requests:__ To attend and manage Your requests to Us. +## 您个人资料的使用 -- __For business transfers:__ We may use Your information to evaluate or conduct a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Our assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which Personal Data held by Us about our Service users is among the assets transferred. -- __For other purposes__: We may use Your information for other purposes, such as data analysis, identifying usage trends, determining the effectiveness of our promotional campaigns and to evaluate and improve our Service, products, services, marketing and your experience. +公司可将个人数据用于以下目的： -We may share Your personal information in the following situations: +- __提供并维护本公司的服务__，包括监控本公司服务的使用情况。 +- __管理您的帐户：__管理您作为服务用户的注册。您提供的个人数据可以让您作为注册用户使用本服务的不同功能。 +- 履行合同：__您通过本服务购买的产品、项目或服务的购买合同或与我们签订的任何其他合同的制定、遵守和履行。 +- __与您联系：__在必要或合理的情况下，通过电子邮件、电话、短信或其他同等形式的电子通信（如移动应用程序的推送通知），就与功能、产品或合同服务（包括安全更新）有关的更新或信息通信与您联系。 +- __向您__提供有关我们提供的与您已购买或询问的产品、服务和活动类似的其他产品、服务和活动的新闻、特别优惠和一般信息，除非您选择不接收此类信息。 +- 管理您的请求：__ 处理和管理您向我们提出的请求。 -- __With Service Providers:__ We may share Your personal information with Service Providers to monitor and analyze the use of our Service, to contact You. -- __For business transfers:__ We may share or transfer Your personal information in connection with, or during negotiations of, any merger, sale of Company assets, financing, or acquisition of all or a portion of Our business to another company. -- __With Affiliates:__ We may share Your information with Our affiliates, in which case we will require those affiliates to honor this Privacy Policy. Affiliates include Our parent company and any other subsidiaries, joint venture partners or other companies that We control or that are under common control with Us. -- __With business partners:__ We may share Your information with Our business partners to offer You certain products, services or promotions. -- __With other users:__ when You share personal information or otherwise interact in the public areas with other users, such information may be viewed by all users and may be publicly distributed outside. -- __With Your consent__: We may disclose Your personal information for any other purpose with Your consent. +- __用于业务转让：__我们可能会使用您的信息来评估或进行合并、剥离、重组、改组、解散或以其他方式出售或转让我们的部分或全部资产，无论是作为持续经营还是作为破产、清算或类似程序的一部分，在转让的资产中包括我们持有的关于我们服务用户的个人数据。 +- __用于其他目的__： 我们可能会将您的信息用于其他目的，例如数据分析、确定使用趋势、确定我们促销活动的有效性，以及评估和改进我们的服务、产品、服务、营销和您的体验。 -## Retention of Your Personal Data +在以下情况下，我们可能会共享您的个人信息： -The Company will retain Your Personal Data only for as long as is necessary for the purposes set out in this Privacy Policy. We will retain and use Your Personal Data to the extent necessary to comply with our legal obligations (for example, if we are required to retain your data to comply with applicable laws), resolve disputes, and enforce our legal agreements and policies. +- 与服务提供商共享：__ 我们可能会与服务提供商共享您的个人信息，以监控和分析我们服务的使用情况，并与您联系。 +- 业务转让：__ 我们可能会在任何合并、出售公司资产、融资或向另一家公司收购我们全部或部分业务的过程中或谈判期间共享或转让您的个人信息。 +- 与关联公司：__ 我们可能会与我们的关联公司共享您的信息，在这种情况下，我们将要求这些关联公司遵守本隐私政策。关联公司包括我们的母公司以及我们控制的或与我们处于共同控制下的任何其他子公司、合资伙伴或其他公司。 +- 与业务合作伙伴：__ 我们可能会与我们的业务合作伙伴共享您的信息，以便向您提供某些产品、服务或促销活动。 +- __与其他用户：__当您在公共区域与其他用户共享个人信息或以其他方式进行交互时，这些信息可能会被所有用户查看，并可能被公开传播到外部。 +- __经您同意__： 在征得您同意的情况下，我们可以出于任何其他目的披露您的个人信息。 -The Company will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period of time, except when this data is used to strengthen the security or to improve the functionality of Our Service, or We are legally obligated to retain this data for longer time periods. +## 保留您的个人资料 -## Transfer of Your Personal Data +本公司保留您的个人资料的期限仅限于本隐私政策规定的目的所需的时间。我们将在必要的范围内保留和使用您的个人数据，以履行我们的法律义务（例如，如果我们被要求保留您的数据以遵守适用法律）、解决争议以及执行我们的法律协议和政策。 -Your information, including Personal Data, is processed at the Company's operating offices and in any other places where the parties involved in the processing are located. It means that this information may be transferred to — and maintained on — computers located outside of Your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from Your jurisdiction. +本公司还将保留使用数据用于内部分析。使用数据的保留期限一般较短，除非这些数据用于加强安全或改进我们服务的功能，或者我们有法律义务将这些数据保留更长时间。 -Your consent to this Privacy Policy followed by Your submission of such information represents Your agreement to that transfer. +## 您个人数据的传输 -The Company will take all steps reasonably necessary to ensure that Your data is treated securely and in accordance with this Privacy Policy and no transfer of Your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of Your data and other personal information. +您的信息（包括个人数据）将在本公司的运营办事处以及参与处理的各方所在的任何其他地方进行处理。这意味着这些信息可能会被转移到您所在州、省、国家或其他政府管辖区以外的计算机上，并在这些计算机上进行维护，而这些地方的数据保护法律可能与您所在的管辖区不同。 -## Delete Your Personal Data +您同意本隐私政策并提交此类信息，即表示您同意该转移。 -You have the right to delete or request that We assist in deleting the Personal Data that We have collected about You. +本公司将采取一切合理必要的措施，确保您的数据得到安全处理，并遵守本隐私政策，除非有适当的控制措施（包括您的数据和其他个人信息的安全），否则不会将您的个人数据传输到任何组织或国家。 -Our Service may give You the ability to delete certain information about You from within the Service. +##删除您的个人数据 -You may update, amend, or delete Your information at any time by signing in to Your Account, if you have one, and visiting the account settings section that allows you to manage Your personal information. You may also contact Us to request access to, correct, or delete any personal information that You have provided to Us. +您有权删除或要求我们协助删除我们收集到的关于您的个人数据。 -Please note, however, that We may need to retain certain information when we have a legal obligation or lawful basis to do so. +我们的服务可能会让您能够在服务内删除有关您的某些信息。 -## Disclosure of Your Personal Data +您可以随时登录您的账户（如果您有账户），访问允许您管理个人信息的账户设置部分，更新、修改或删除您的信息。您也可以联系我们，要求访问、修改或删除您提供给我们的任何个人信息。 -### Business Transactions +但请注意，当我们有法律义务或合法依据时，我们可能需要保留某些信息。 -If the Company is involved in a merger, acquisition or asset sale, Your Personal Data may be transferred. We will provide notice before Your Personal Data is transferred and becomes subject to a different Privacy Policy. +## 您个人信息的披露 -### Law enforcement +### 商业交易 -Under certain circumstances, the Company may be required to disclose Your Personal Data if required to do so by law or in response to valid requests by public authorities (e.g. a court or a government agency). +如果公司涉及合并、收购或资产出售，您的个人数据可能会被转移。在您的个人数据被转移并受不同的隐私政策约束之前，我们将发出通知。 -### Other legal requirements +#### 执法 -The Company may disclose Your Personal Data in the good faith belief that such action is necessary to: +在某些情况下，如果法律要求或公共当局（如法院或政府机构）的有效要求，本公司可能需要披露您的个人资料。 -- Comply with a legal obligation -- Protect and defend the rights or property of the Company -- Prevent or investigate possible wrongdoing in connection with the Service -- Protect the personal safety of Users of the Service or the public -- Protect against legal liability +### 其他法律要求 -## Security of Your Personal Data +公司可能会在真诚相信有必要披露您的个人数据的情况下披露您的个人数据，以便 -The security of Your Personal Data is important to Us, but remember that no method of transmission over the Internet, or method of electronic storage is 100% secure. While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security. +- 遵守法律义务 +- 保护和捍卫公司的权利或财产 +- 防止或调查与服务有关的可能不当行为 +- 保护服务用户或公众的人身安全 +- 防止承担法律责任 +## 您个人数据的安全 +我们非常重视您的个人数据的安全，但请记住，任何互联网传输方式或电子存储方式都不是百分之百安全的。虽然我们努力使用商业上可接受的方法来保护您的个人数据，但我们不能保证其绝对安全。 @@ -211,32 +210,34 @@ The security of Your Personal Data is important to Us, but remember that no meth -# Children's Privacy -Our Service does not address anyone under the age of 13. We do not knowingly collect personally identifiable information from anyone under the age of 13. If You are a parent or guardian and You are aware that Your child has provided Us with Personal Data, please contact Us. If We become aware that We have collected Personal Data from anyone under the age of 13 without verification of parental consent, We take steps to remove that information from Our servers. -If We need to rely on consent as a legal basis for processing Your information and Your country requires consent from a parent, We may require Your parent's consent before We collect and use that information. +# 儿童隐私 +我们的服务不针对 13 岁以下的任何人。如果您是家长或监护人，并意识到您的孩子向我们提供了个人数据，请联系我们。如果我们发现我们在未核实父母同意的情况下收集了 13 岁以下任何人的个人数据，我们会采取措施从我们的服务器上删除该信息。 -# Links to Other Websites +如果我们需要依赖同意作为处理您的信息的法律依据，而您所在的国家/地区要求获得父母的同意，我们可能会在收集和使用该信息之前要求获得您父母的同意。 -Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit. -We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services. +#与其他网站的链接 -# Changes to this Privacy Policy +我们的服务可能包含指向非我们运营的其他网站的链接。如果您点击第三方链接，您将被引导至该第三方网站。我们强烈建议您查看您访问的每个网站的隐私政策。 -We may update Our Privacy Policy from time to time. We will notify You of any changes by posting the new Privacy Policy on this page. +对于任何第三方网站或服务的内容、隐私政策或做法，我们无法控制，也不承担任何责任。 -We will let You know via email and/or a prominent notice on Our Service, prior to the change becoming effective and update the "Last updated" date at the top of this Privacy Policy. +# 本隐私政策的变更 -You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page. +我们可能会不时更新我们的隐私政策。如有任何变更，我们将通过在本页面上发布新的隐私政策来通知您。 -# Contact Us +在变更生效之前，我们将通过电子邮件和/或我们服务上的显著通知告知您，并更新本隐私政策顶部的 "最后更新 "日期。 -If you have any questions about this Privacy Policy, You can contact us: +建议您定期查看本隐私政策是否有任何变更。本隐私政策的变更在本页面发布时生效。 +# 联系我们 +如果您对本隐私政策有任何疑问，可以联系我们： -- By phone number: 0771-3164099 \ No newline at end of file + + +- 电话号码：0771-3164099 From 94f1e764bcce4d998f195b175d1baeb0907ae346 Mon Sep 17 00:00:00 2001 From: gwokwong Date: Fri, 21 Jul 2023 18:34:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/site/en/privacy.md | 8 +-- public/site/zh/privacy.md | 110 ++++++++++---------------------------- 2 files changed, 32 insertions(+), 86 deletions(-) diff --git a/public/site/en/privacy.md b/public/site/en/privacy.md index 0eb2b0722..5e962b6a1 100644 --- a/public/site/en/privacy.md +++ b/public/site/en/privacy.md @@ -16,12 +16,12 @@ The words of which the initial letter is capitalized have meanings defined under For the purposes of this Privacy Policy: -- __Account__ means a unique account created for You to access our Service or parts of our Service. -- __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority. +- Account: means a unique account created for You to access our Service or parts of our Service. +- Affiliate: means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority. -- __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Guangxi Hitosea Information Technology Co., No. 1411, 14/F, Building 1, Wuxiang Hangyang City, Liangqing District, Nanning City, Guangxi Zhuang Autonomous Region, China. +- Company: (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Guangxi Hitosea Information Technology Co., No. 1411, 14/F, Building 1, Wuxiang Hangyang City, Liangqing District, Nanning City, Guangxi Zhuang Autonomous Region, China. @@ -239,4 +239,4 @@ If you have any questions about this Privacy Policy, You can contact us: -- By phone number: 0771-3164099 \ No newline at end of file +- By phone number: 0771-3164099 diff --git a/public/site/zh/privacy.md b/public/site/zh/privacy.md index f12fd1883..deb9e914f 100644 --- a/public/site/zh/privacy.md +++ b/public/site/zh/privacy.md @@ -8,7 +8,7 @@ # 解释和定义 -##释义 +## 释义 首字母大写的词语在以下情况下具有定义的含义。以下定义具有相同含义，无论其为单数还是复数。 @@ -16,40 +16,18 @@ 在本隐私政策中： -- __账户__是指为您访问我们的服务或我们服务的部分内容而创建的唯一账户。 -- __关联方__系指控制一方、受一方控制或与一方受共同控制的实体，其中 "控制 "系指拥有 50%或 50%以上有权投票选举董事或其他管理权的股份、股权或其他证券。 - - - -- __公司__（在本协议中称为 "本公司"、"我们"、"我们的 "或 "我们的"）是指广西海通盛世信息技术有限公司，地址为中国广西壮族自治区南宁市良庆区五象瀚洋城 1 号楼 14 层 1411 号。 - - - -- __Cookies__是网站放置在您的计算机、移动设备或任何其他设备上的小文件，其中包含您在该网站上的详细浏览记录及其他多种用途。 - -- __国家__是指 中国 - -- __设备__是指可以访问本服务的任何设备，如计算机、手机或数字平板电脑。 - - - -- __个人数据__是指与已识别或可识别的个人有关的任何信息。 - - - - -- __服务__系指本网站。 - -- __服务提供商__系指代表本公司处理数据的任何自然人或法人。它指公司雇用的第三方公司或个人，以促进服务、代表公司提供服务、执行与服务有关的服务或协助公司分析服务的使用情况。 - - -- __使用数据__系指自动收集的数据，这些数据可以是使用本服务时产生的，也可以是本服务基础设施本身产生的（例如，访问页面的持续时间）。 - - -- 网站__是指 DooTask，可从 [https://www.dootask.com/](https://www.dootask.com/)访问。 - -- __您__指访问或使用本服务的个人，或该个人访问或使用本服务所代表的公司或其他法人实体（如适用）。 - +- 账户：是指为您访问我们的服务或我们服务的部分内容而创建的唯一账户。 +- 关联方:指控制一方、受一方控制或与一方受共同控制的实体，其中 "控制 "系指拥有 50%或 50%以上有权投票选举董事或其他管理权的股份、股权或其他证券。 +- 公司：（在本协议中称为 "本公司"、"我们"、"我们的 "或 "我们的"）是指广西海通盛世信息技术有限公司，地址为中国广西壮族自治区南宁市良庆区五象瀚洋城 1 号楼 14 层 1411 号。 +- Cookies：是网站放置在您的计算机、移动设备或任何其他设备上的小文件，其中包含您在该网站上的详细浏览记录及其他多种用途。 +- 国家：是指中国 +- 设备：是指可以访问本服务的任何设备，如计算机、手机或数字平板电脑。 +- 个人数据：是指与已识别或可识别的个人有关的任何信息。 +- 服务：系指本网站。 +- 服务提供商：指代表本公司处理数据的任何自然人或法人。它指公司雇用的第三方公司或个人，以促进服务、代表公司提供服务、执行与服务有关的服务或协助公司分析服务的使用情况。 +- 使用数据：系指自动收集的数据，这些数据可以是使用本服务时产生的，也可以是本服务基础设施本身产生的（例如，访问页面的持续时间）。 +- 网站:是指 DooTask，可从 [https://www.dootask.com/](https://www.dootask.com/)访问。 +- 您:指访问或使用本服务的个人，或该个人访问或使用本服务所代表的公司或其他法人实体（如适用）。 # 收集和使用您的个人数据 @@ -60,17 +38,9 @@ 在使用我们的服务时，我们可能会要求您向我们提供某些可用于联系或识别您身份的个人身份信息。个人身份信息可能包括但不限于 - - - 电话号码 - - - - - 使用数据 - - #### 使用数据 使用数据是在使用服务时自动收集的。 @@ -82,11 +52,7 @@ 当您访问我们的服务时，或者当您通过移动设备访问服务时，我们也会收集您的浏览器发送的信息。 - - - - -###跟踪技术和 Cookie +### 跟踪技术和 Cookie 我们使用 Cookie 和类似的跟踪技术来跟踪我们服务上的活动并存储某些信息。跟踪技术包括信标、标签和脚本，用于收集和跟踪信息以及改进和分析我们的服务。我们使用的技术可能包括 @@ -128,24 +94,24 @@ Cookie 可以是 "持久 "或 "会话 "Cookie。永久 Cookie 会在您离线后 公司可将个人数据用于以下目的： -- __提供并维护本公司的服务__，包括监控本公司服务的使用情况。 -- __管理您的帐户：__管理您作为服务用户的注册。您提供的个人数据可以让您作为注册用户使用本服务的不同功能。 -- 履行合同：__您通过本服务购买的产品、项目或服务的购买合同或与我们签订的任何其他合同的制定、遵守和履行。 -- __与您联系：__在必要或合理的情况下，通过电子邮件、电话、短信或其他同等形式的电子通信（如移动应用程序的推送通知），就与功能、产品或合同服务（包括安全更新）有关的更新或信息通信与您联系。 -- __向您__提供有关我们提供的与您已购买或询问的产品、服务和活动类似的其他产品、服务和活动的新闻、特别优惠和一般信息，除非您选择不接收此类信息。 -- 管理您的请求：__ 处理和管理您向我们提出的请求。 +- 提供并维护本公司的服务，包括监控本公司服务的使用情况。 +- 管理您的帐户：管理您作为服务用户的注册。您提供的个人数据可以让您作为注册用户使用本服务的不同功能。 +- 履行合同：您通过本服务购买的产品、项目或服务的购买合同或与我们签订的任何其他合同的制定、遵守和履行。 +- 与您联系：在必要或合理的情况下，通过电子邮件、电话、短信或其他同等形式的电子通信（如移动应用程序的推送通知），就与功能、产品或合同服务（包括安全更新）有关的更新或信息通信与您联系。 +- 向您提供有关我们提供的与您已购买或询问的产品、服务和活动类似的其他产品、服务和活动的新闻、特别优惠和一般信息，除非您选择不接收此类信息。 +- 管理您的请求： 处理和管理您向我们提出的请求。 -- __用于业务转让：__我们可能会使用您的信息来评估或进行合并、剥离、重组、改组、解散或以其他方式出售或转让我们的部分或全部资产，无论是作为持续经营还是作为破产、清算或类似程序的一部分，在转让的资产中包括我们持有的关于我们服务用户的个人数据。 -- __用于其他目的__： 我们可能会将您的信息用于其他目的，例如数据分析、确定使用趋势、确定我们促销活动的有效性，以及评估和改进我们的服务、产品、服务、营销和您的体验。 +- 用于业务转让：我们可能会使用您的信息来评估或进行合并、剥离、重组、改组、解散或以其他方式出售或转让我们的部分或全部资产，无论是作为持续经营还是作为破产、清算或类似程序的一部分，在转让的资产中包括我们持有的关于我们服务用户的个人数据。 +- 用于其他目的： 我们可能会将您的信息用于其他目的，例如数据分析、确定使用趋势、确定我们促销活动的有效性，以及评估和改进我们的服务、产品、服务、营销和您的体验。 在以下情况下，我们可能会共享您的个人信息： -- 与服务提供商共享：__ 我们可能会与服务提供商共享您的个人信息，以监控和分析我们服务的使用情况，并与您联系。 -- 业务转让：__ 我们可能会在任何合并、出售公司资产、融资或向另一家公司收购我们全部或部分业务的过程中或谈判期间共享或转让您的个人信息。 -- 与关联公司：__ 我们可能会与我们的关联公司共享您的信息，在这种情况下，我们将要求这些关联公司遵守本隐私政策。关联公司包括我们的母公司以及我们控制的或与我们处于共同控制下的任何其他子公司、合资伙伴或其他公司。 -- 与业务合作伙伴：__ 我们可能会与我们的业务合作伙伴共享您的信息，以便向您提供某些产品、服务或促销活动。 -- __与其他用户：__当您在公共区域与其他用户共享个人信息或以其他方式进行交互时，这些信息可能会被所有用户查看，并可能被公开传播到外部。 -- __经您同意__： 在征得您同意的情况下，我们可以出于任何其他目的披露您的个人信息。 +- 与服务提供商共享: 我们可能会与服务提供商共享您的个人信息，以监控和分析我们服务的使用情况，并与您联系。 +- 业务转让：我们可能会在任何合并、出售公司资产、融资或向另一家公司收购我们全部或部分业务的过程中或谈判期间共享或转让您的个人信息。 +- 与关联公司：我们可能会与我们的关联公司共享您的信息，在这种情况下，我们将要求这些关联公司遵守本隐私政策。关联公司包括我们的母公司以及我们控制的或与我们处于共同控制下的任何其他子公司、合资伙伴或其他公司。 +- 与业务合作伙伴： 我们可能会与我们的业务合作伙伴共享您的信息，以便向您提供某些产品、服务或促销活动。 +- 与其他用户：当您在公共区域与其他用户共享个人信息或以其他方式进行交互时，这些信息可能会被所有用户查看，并可能被公开传播到外部。 +- 经您同意： 在征得您同意的情况下，我们可以出于任何其他目的披露您的个人信息。 ## 保留您的个人资料 @@ -196,22 +162,6 @@ Cookie 可以是 "持久 "或 "会话 "Cookie。永久 Cookie 会在您离线后 我们非常重视您的个人数据的安全，但请记住，任何互联网传输方式或电子存储方式都不是百分之百安全的。虽然我们努力使用商业上可接受的方法来保护您的个人数据，但我们不能保证其绝对安全。 - - - - - - - - - - - - - - - - # 儿童隐私 我们的服务不针对 13 岁以下的任何人。如果您是家长或监护人，并意识到您的孩子向我们提供了个人数据，请联系我们。如果我们发现我们在未核实父母同意的情况下收集了 13 岁以下任何人的个人数据，我们会采取措施从我们的服务器上删除该信息。 @@ -236,8 +186,4 @@ Cookie 可以是 "持久 "或 "会话 "Cookie。永久 Cookie 会在您离线后 # 联系我们 如果您对本隐私政策有任何疑问，可以联系我们： - - - - - 电话号码：0771-3164099 From 42f805d7ccacc3e5bca5836eff84a7ed0c6702c8 Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Fri, 21 Jul 2023 20:59:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix=EF=BC=9A1.=E4=BB=AA=E8=A1=A8=E7=9B=98?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=AF=E8=A7=81=E6=80=A7=E6=9C=89=E6=88=91?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E4=B8=8D=E6=98=AF=E6=88=91=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E7=9A=84bug=20=EF=BC=8C2.=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=AF=84=E8=AE=BA=E9=97=B4=E8=B7=9D=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8E=E5=8F=AF=E8=AF=84=E8=AE=BAemoj?= =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=8A=A0=E8=AF=84=E8=AE=BA=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=20=EF=BC=8C3,=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E4=BA=A4=E9=9B=86?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=85=E4=BB=BB=E5=8A=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=20=EF=BC=8C4.=20=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=92=A4?= =?UTF-8?q?=E5=9B=9E=E5=90=8E=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D,=205.=20=E5=AE=A1=E6=89=B9=E6=B7=BB=E5=8A=A0=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=90=8E=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E4=B8=8B=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/ApproveController.php | 24 ++++++++++++++++++- .../Controllers/Api/ProjectController.php | 4 ++-- docker-compose.yml | 2 +- .../js/pages/manage/approve/details.vue | 22 +++++++++++++---- .../assets/js/pages/manage/approve/index.vue | 1 - resources/assets/js/pages/manage/calendar.vue | 2 +- .../pages/manage/components/ProjectPanel.vue | 2 +- resources/assets/js/store/getters.js | 4 ++-- resources/assets/sass/pages/page-approve.scss | 3 +-- resources/views/push/bot.blade.php | 12 ++++++++++ 10 files changed, 60 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php index d0c408515..35f871fd2 100755 --- a/app/Http/Controllers/Api/ApproveController.php +++ b/app/Http/Controllers/Api/ApproveController.php @@ -190,12 +190,25 @@ class ApproveController extends AbstractController $data['userid'] = (string)$user->userid; $data['content'] = Request::input('content'); //内容+图片 + $processInst = $this->getProcessById($data['proc_inst_id']); + $ret = Ihttp::ihttp_post($this->flow_url.'/api/v1/workflow/process/addGlobalComment', json_encode(Base::arrayKeyToCamel($data))); $process = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true); if (!$process || $process['status'] != 200) { return Base::retError($process['message'] ?? '添加失败'); } - // + + // 推送通知 + $botUser = User::botGetOrCreate('approval-alert'); + foreach ( $processInst['userids'] as $id) { + if($id != $user->userid){ + $dialog = WebSocketDialog::checkUserDialog($botUser, $id); + $processInst['comment_user_id'] = $user->userid; + $processInst['comment_content'] = json_decode($data['content'],true)['content']; + $this->approveMsg('approve_comment_notifier', $dialog, $botUser, $processInst, $processInst); + } + } + $res = Base::arrayKeyToUnderline($process['data']); return Base::retSuccess('success', $res); } @@ -958,6 +971,8 @@ class ApproveController extends AbstractController 'type' => $process['var']['type'], 'start_time' => $process['var']['start_time'], 'end_time' => $process['var']['end_time'], + 'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '', + 'comment_content' => $process['comment_content'] ?? '' ]; $text = view('push.bot', ['type' => $type, 'action' => $action, 'is_finished' => $process['is_finished'], 'data' => (object)$data])->render(); $text = preg_replace("/^\x20+/", "", $text); @@ -1011,6 +1026,7 @@ class ApproveController extends AbstractController } // $res = Base::arrayKeyToUnderline($process['data']); + $res['userids'] = []; foreach ($res['node_infos'] as &$val) { if (isset($val['node_user_list'])) { $node = $val['node_user_list']; @@ -1020,10 +1036,12 @@ class ApproveController extends AbstractController continue; } $val['node_user_list'][$k]['userimg'] = User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname); + $res['userids'][] = $item['target_id']; } }else if($val['aprover_id']){ $info = User::whereUserid($val['aprover_id'])->first(); $val['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : ''; + $res['userids'][] = $val['aprover_id']; } } // 全局评论 @@ -1039,6 +1057,10 @@ class ApproveController extends AbstractController } $info = User::whereUserid($res['start_user_id'])->first(); $res['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : ''; + // + $res['userids'][] = $info->userid; + $res['userids'] = array_unique($res['userids']); + // return $res; } diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 613177483..91bbf462b 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -1079,8 +1079,8 @@ class ProjectController extends AbstractController $timerange = explode(',', $timerange); } if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) { - $query->where('project_tasks.start_at', '>=', Carbon::parse($timerange[0])->startOfDay()); - $query->where('project_tasks.end_at', '<=', Carbon::parse($timerange[1])->endOfDay()); + $query->where('project_tasks.start_at', '<=', Carbon::parse($timerange[1])->endOfDay()); + $query->where('project_tasks.end_at', '>=', Carbon::parse($timerange[0])->startOfDay()); } }) ->when(!empty($taskid), function ($query) use ($taskid) { diff --git a/docker-compose.yml b/docker-compose.yml index 8e656f032..b89aba407 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -150,7 +150,7 @@ services: approve: container_name: "dootask-approve-${APP_ID}" - image: "hitosea2020/go-approve:latest" + image: "hitosea2020/go-approve:0.1.1" environment: TZ: "Asia/Shanghai" MYSQL_HOST: "${DB_HOST}" diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index 1f9616fc6..b2fd8c984 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -1,6 +1,6 @@