Skip to content

Commit 5577159

Browse files
lsk569937453lsk569937453
committed
Fix conficts!
2 parents d905c90 + 9f631dc commit 5577159

24 files changed

+851
-112
lines changed

‎LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎README.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,39 @@
11
# CodeMagic
2+
## 主要功能
23
本地离线工具集合，包含以下功能:
34
- base64转码/解码:文本转base64,base64转文本，图片转base64，base64转图片
4-
- 格式化:格式化json/yaml
5+
- 格式化:格式化json/yaml/xml
56
- urlEncode/urlDecode
67
- 摘要算法:计算文本的md5,sha256。计算多个文件的md5,sha256
78
- 时间戳: 时间戳转时间，时间转时间戳
89
- 二维码/条形码生成
910
- 调色板
1011
- 文本对比工具
1112
- 国密算法(SM2,SM3,SM4)
13+
14+
## relase 下载地址
15+
https://github.com/lsk569937453/code-magic-public/releases
16+
## 一些截图
17+
### 正常模式
18+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16%20-192959.png)
19+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16%20-193041.png)
20+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16%20-193052.png)
21+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16%20-193110.png)
22+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16%20-193152.png)
23+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16%20-193212.png)
24+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16-%20192905.png)
25+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16-%20193014.png)
26+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16-%20193028.png)
27+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16-%20193229.png)
28+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/light/2023-12-16192843.png)
29+
### 暗黑模式
30+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16%20-193405.png)
31+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16%20-193414.png)
32+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16%20-193424.png)
33+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16%20-193438.png)
34+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16%20-193450.png)
35+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16-%20193310.png)
36+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16-%20193330.png)
37+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16-%20193341.png)
38+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16-%20193354.png)
39+
![alt tag](https://raw.githubusercontent.com/lsk569937453/image_repo/main/code_magic/dark/2023-12-16--193249.png)

‎src-tauri/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "code_magic"
3-
version = "0.0.3"
3+
version = "0.0.18"
44
description = "A development tools"
55
authors = ["lsk"]
66
license = "MIT"

‎src-tauri/src/common_tools/cmd.rs

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ use crate::common_tools::base64::base64_encode_of_image_with_error;
44
use crate::common_tools::base64::base64_encode_with_error;
55
use crate::common_tools::base64::base64_save_image_with_error;
66
use crate::common_tools::base_response::BaseResponse;
7+
use crate::common_tools::code_full_half::to_cdb_with_error;
8+
use crate::common_tools::code_full_half::to_dbc_with_error;
79
use crate::common_tools::crypto_algorithm::get_sm2_keypair_with_error;
810
use crate::common_tools::crypto_algorithm::sm2_decrypt_with_error;
911
use crate::common_tools::crypto_algorithm::sm2_encrypt_with_error;
@@ -20,11 +22,17 @@ use crate::common_tools::qrcode::export_barcode_with_error;
2022
use crate::common_tools::qrcode::export_qrcode_with_error;
2123
use crate::common_tools::qrcode::get_barcode_with_error;
2224
use crate::common_tools::qrcode::get_qrcode_with_error;
25+
use crate::common_tools::sql_lite::get_menu_config_with_error;
26+
use crate::common_tools::sql_lite::set_menu_index_with_error;
27+
use crate::common_tools::sql_lite::GetMenuConfigReq;
2328
use crate::common_tools::timestamp::format_datetime_to_timestamp_with_error;
2429
use crate::common_tools::timestamp::format_timestamp_to_datetime_with_error;
2530
use crate::common_tools::timestamp::get_current_timestamp_with_error;
2631
use crate::common_tools::urlencode::url_decode_with_error;
2732
use crate::common_tools::urlencode::url_encode_with_error;
33+
34+
use crate::sql_lite::connection::{SqlLite, SqlLiteState};
35+
use tauri::State;
2836
#[tauri::command]
2937
pub fn base64_encode(source_string: String) -> String {
3038
match base64_encode_with_error(source_string) {
@@ -64,6 +72,44 @@ pub fn base64_decode(source_string: String) -> String {
6472
}
6573
}
6674
#[tauri::command]
75+
pub fn to_cdb(source_string: String) -> String {
76+
match to_cdb_with_error(source_string) {
77+
Ok(item) => {
78+
let res = BaseResponse {
79+
response_code: 0,
80+
response_msg: item,
81+
};
82+
serde_json::to_string(&res).unwrap()
83+
}
84+
Err(e) => {
85+
let res = BaseResponse {
86+
response_code: 1,
87+
response_msg: e.to_string(),
88+
};
89+
serde_json::to_string(&res).unwrap()
90+
}
91+
}
92+
}
93+
#[tauri::command]
94+
pub fn to_dbc(source_string: String) -> String {
95+
match to_dbc_with_error(source_string) {
96+
Ok(item) => {
97+
let res = BaseResponse {
98+
response_code: 0,
99+
response_msg: item,
100+
};
101+
serde_json::to_string(&res).unwrap()
102+
}
103+
Err(e) => {
104+
let res = BaseResponse {
105+
response_code: 1,
106+
response_msg: e.to_string(),
107+
};
108+
serde_json::to_string(&res).unwrap()
109+
}
110+
}
111+
}
112+
#[tauri::command]
67113
pub fn base64_encode_of_image(source_string: String) -> String {
68114
match base64_encode_of_image_with_error(source_string) {
69115
Ok(item) => {
@@ -488,3 +534,48 @@ pub fn get_about_version() -> String {
488534
}
489535
}
490536
}
537+
#[tauri::command]
538+
pub fn get_menu_config(
539+
state: State<SqlLiteState>,
540+
get_menu_config_reqs: Vec<GetMenuConfigReq>,
541+
) -> String {
542+
match get_menu_config_with_error(state, get_menu_config_reqs) {
543+
Ok(item) => {
544+
let res = BaseResponse {
545+
response_code: 0,
546+
response_msg: item,
547+
};
548+
serde_json::to_string(&res).unwrap()
549+
}
550+
Err(e) => {
551+
let res = BaseResponse {
552+
response_code: 1,
553+
response_msg: e.to_string(),
554+
};
555+
serde_json::to_string(&res).unwrap()
556+
}
557+
}
558+
}
559+
#[tauri::command]
560+
pub fn set_menu_index(
561+
state: State<SqlLiteState>,
562+
source_index: i32,
563+
dst_menu_index: i32,
564+
) -> String {
565+
match set_menu_index_with_error(state, source_index, dst_menu_index) {
566+
Ok(item) => {
567+
let res = BaseResponse {
568+
response_code: 0,
569+
response_msg: item,
570+
};
571+
serde_json::to_string(&res).unwrap()
572+
}
573+
Err(e) => {
574+
let res = BaseResponse {
575+
response_code: 1,
576+
response_msg: e.to_string(),
577+
};
578+
serde_json::to_string(&res).unwrap()
579+
}
580+
}
581+
}

0 commit comments

Comments
 (0)