Skip to content

Commit cbc3c0c

Browse files
author
杨利兵
committed
删除 \r
1 parent 9ddf20e commit cbc3c0c

File tree

10 files changed

+65
-65
lines changed

10 files changed

+65
-65
lines changed

‎src/main/java/com/yanglb/codegen/core/generator/BaseGenerator.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public class BaseGenerator implements IGenerator{
3434

3535
protected void printInfo() {
3636
System.out.println("生成信息:");
37-
System.out.printf("%8s: %s\r\n", "cmd", paramaModel.getCmd());
38-
System.out.printf("%8s: %s\r\n", "file", paramaModel.getFile());
39-
System.out.printf("%8s: \r\n", "options");
37+
System.out.printf("%8s: %s\n", "cmd", paramaModel.getCmd());
38+
System.out.printf("%8s: %s\n", "file", paramaModel.getFile());
39+
System.out.printf("%8s: \n", "options");
4040
CommandLine cl = paramaModel.getOptions();
4141
for(Option opt : cl.getOptions()) {
4242
String s = opt.getLongOpt();
4343
if (s == null) s = opt.getOpt();
4444
if (opt.hasArgs()) {
45-
System.out.printf("%8s-%s=%s\r\n", "", s, opt.getValuesList());
45+
System.out.printf("%8s-%s=%s\n", "", s, opt.getValuesList());
4646
} else if (opt.hasArg()) {
47-
System.out.printf("%8s-%s=%s\r\n", "", s, opt.getValue());
47+
System.out.printf("%8s-%s=%s\n", "", s, opt.getValue());
4848
} else {
49-
System.out.printf("%8s-%s\r\n", "", s);
49+
System.out.printf("%8s-%s\n", "", s);
5050
}
5151
}
5252
System.out.println();

‎src/main/java/com/yanglb/codegen/core/parser/BaseParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public ParamaModel parsing() {
157157
}
158158
File f = new File(file);
159159
if(!(f.exists() && f.isFile())) {
160-
throw new IllegalArgumentException(String.format("指定的文件(%s)不存在或者是一个目录。\r\n", file));
160+
throw new IllegalArgumentException(String.format("指定的文件(%s)不存在或者是一个目录。\n", file));
161161
}
162162

163163
// 根据命令生成解析

‎src/main/java/com/yanglb/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ public String genDdl(DdlModel model) throws CodeGenException {
9696

9797
// 　表名
9898
String tableName = this.genFullTableName(model);
99-
sb.append(String.format("-- %s \r\n", model.getSheetName()));
100-
sb.append(String.format("-- version %s \r\n", model.getVersion()));
101-
sb.append(String.format("CREATE TABLE %s (\r\n", tableName));
99+
sb.append(String.format("-- %s \n", model.getSheetName()));
100+
sb.append(String.format("-- version %s \n", model.getVersion()));
101+
sb.append(String.format("CREATE TABLE %s (\n", tableName));
102102

103103
Integer autoIncrement = null;
104104
for (DdlDetail detail : model.getDetail()) {
@@ -127,20 +127,20 @@ public String genDdl(DdlModel model) throws CodeGenException {
127127

128128
// 主键
129129
if (!StringUtil.isNullOrEmpty(primaryKey)) {
130-
sb.append(String.format(" PRIMARY KEY (%s),\r\n", primaryKey));
130+
sb.append(String.format(" PRIMARY KEY (%s),\n", primaryKey));
131131
}
132132

133133
// 索引
134134
if (!indexMap.isEmpty()) {
135135
for(List<DdlDetail> list : indexMap.values()) {
136-
sb.append(String.format(" %s,\r\n", this.indexUniqueSql(list, true)));
136+
sb.append(String.format(" %s,\n", this.indexUniqueSql(list, true)));
137137
}
138138
}
139139

140140
// 约束
141141
if (!uniqueMap.isEmpty()) {
142142
for(List<DdlDetail> list : uniqueMap.values()) {
143-
sb.append(String.format(" %s,\r\n", this.indexUniqueSql(list, false)));
143+
sb.append(String.format(" %s,\n", this.indexUniqueSql(list, false)));
144144
}
145145
}
146146

@@ -159,7 +159,7 @@ public String genDdl(DdlModel model) throws CodeGenException {
159159
info.append(String.format("COMMENT='%s'", model.getSheetName()));
160160

161161
// 结束
162-
sb.append(String.format(") %s;\r\n\r\n", info.toString().trim()));
162+
sb.append(String.format(") %s;\n\n", info.toString().trim()));
163163

164164
return sb.toString();
165165
}
@@ -260,7 +260,7 @@ private String genDdlDetail(DdlDetail detail) {
260260
sb.append(String.format(" COMMENT '%s'", name));
261261
}
262262

263-
sb.append(",\r\n");
263+
sb.append(",\n");
264264
return sb.toString();
265265
}
266266

@@ -272,10 +272,10 @@ private String genDdlDetail(DdlDetail detail) {
272272
private String genForeignKey() throws CodeGenException {
273273
StringBuilder sb = new StringBuilder();
274274
if (this.foreignKeyList.size() > 0) {
275-
sb.append("\r\n");
276-
sb.append("-- -------------------------------\r\n");
277-
sb.append("-- foreign key list\r\n");
278-
sb.append("-- -------------------------------\r\n");
275+
sb.append("\n");
276+
sb.append("-- -------------------------------\n");
277+
sb.append("-- foreign key list\n");
278+
sb.append("-- -------------------------------\n");
279279
}
280280

281281
// 所有表的外键放在最后处理
@@ -307,9 +307,9 @@ private String genForeignKey() throws CodeGenException {
307307
String tableName = genFullTableName(model.getDdlModel());
308308
String referenceTableName = genFullTableName(model
309309
.getForeignColumns().get(0).getForeignDdlModel());
310-
sb.append(String.format("ALTER TABLE %s ADD FOREIGN KEY(%s) \r\n"
311-
+ "REFERENCES %s (%s) \r\n"
312-
+ "ON DELETE CASCADE ON UPDATE CASCADE; \r\n\r\n",
310+
sb.append(String.format("ALTER TABLE %s ADD FOREIGN KEY(%s) \n"
311+
+ "REFERENCES %s (%s) \n"
312+
+ "ON DELETE CASCADE ON UPDATE CASCADE; \n\n",
313313
tableName, columnName, referenceTableName,
314314
referenceColumnName));
315315
}

‎src/main/java/com/yanglb/codegen/core/translator/impl/DdlSqlServerTranslatorImpl.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ protected void onTranslate() throws CodeGenException {
6363
private String genForeignKey() throws CodeGenException {
6464
StringBuilder sb = new StringBuilder();
6565
if(this.foreignKeyList.size()>0) {
66-
sb.append("\r\n");
67-
sb.append("---------------------------------\r\n");
68-
sb.append("-- foreign key list\r\n");
69-
sb.append("---------------------------------\r\n");
66+
sb.append("\n");
67+
sb.append("---------------------------------\n");
68+
sb.append("-- foreign key list\n");
69+
sb.append("---------------------------------\n");
7070
}
7171

7272
// 所有表的外键放在最后处理
@@ -110,9 +110,9 @@ private String genForeignKey() throws CodeGenException {
110110
// 表名
111111
String tableName = genFullTableName(model.getDdlModel());
112112
String referenceTableName = genFullTableName(model.getForeignColumns().get(0).getForeignDdlModel());
113-
sb.append(String.format("ALTER TABLE %s WITH CHECK ADD CONSTRAINT %s FOREIGN KEY(%s)\r\n"
114-
+ "REFERENCES %s (%s)\r\n"
115-
+ "GO\r\n\r\n",
113+
sb.append(String.format("ALTER TABLE %s WITH CHECK ADD CONSTRAINT %s FOREIGN KEY(%s)\n"
114+
+ "REFERENCES %s (%s)\n"
115+
+ "GO\n\n",
116116
tableName,
117117
foreignKeyName,
118118
columnName,
@@ -135,9 +135,9 @@ public String genDdl(DdlModel model)
135135

136136
//　表名
137137
String tableName = this.genFullTableName(model);
138-
sb.append(String.format("-- %s \r\n", model.getSheetName()));
139-
sb.append(String.format("-- DROP TABLE %s; \r\n", tableName));
140-
sb.append(String.format("CREATE TABLE %s (\r\n", tableName));
138+
sb.append(String.format("-- %s \n", model.getSheetName()));
139+
sb.append(String.format("-- DROP TABLE %s; \n", tableName));
140+
sb.append(String.format("CREATE TABLE %s (\n", tableName));
141141

142142
// 逐列添加
143143
for(DdlDetail detail:model.getDetail()) {
@@ -155,13 +155,13 @@ public String genDdl(DdlModel model)
155155

156156
// 主键
157157
if(!StringUtil.isNullOrEmpty(primaryKey)) {
158-
sb.append(String.format(" PRIMARY KEY (%s),\r\n", primaryKey));
158+
sb.append(String.format(" PRIMARY KEY (%s),\n", primaryKey));
159159
}
160160

161161
// 删除最后一个 ,号
162162
sb.deleteCharAt(sb.lastIndexOf(","));
163-
sb.append(")\r\nGO \r\n");
164-
sb.append("\r\n");
163+
sb.append(")\nGO \n");
164+
sb.append("\n");
165165

166166
return sb.toString();
167167
}
@@ -207,7 +207,7 @@ private String genDdlDetail(DdlDetail detail) {
207207
}
208208
}
209209

210-
sb.append(",\r\n");
210+
sb.append(",\n");
211211
return sb.toString();
212212
}
213213
}

‎src/main/java/com/yanglb/codegen/core/translator/impl/DdlSqliteTranslatorImpl.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public String genDdl(DdlModel model)
7272
String primaryKey = "";
7373

7474
String tableName = this.genFullTableName(model);
75-
sb.append(String.format("-- %s \r\n", model.getSheetName()));
76-
sb.append(String.format("-- DROP TABLE %s; \r\n", tableName));
77-
sb.append(String.format("CREATE TABLE %s (\r\n", tableName));
75+
sb.append(String.format("-- %s \n", model.getSheetName()));
76+
sb.append(String.format("-- DROP TABLE %s; \n", tableName));
77+
sb.append(String.format("CREATE TABLE %s (\n", tableName));
7878
for(DdlDetail detail:model.getDetail()) {
7979
if(detail.isColKey()) {
8080
if(!StringUtil.isNullOrEmpty(primaryKey)) {
@@ -91,17 +91,17 @@ public String genDdl(DdlModel model)
9191

9292
// 主键
9393
if(!StringUtil.isNullOrEmpty(primaryKey)) {
94-
sb.append(String.format(" PRIMARY KEY (%s),\r\n", primaryKey));
94+
sb.append(String.format(" PRIMARY KEY (%s),\n", primaryKey));
9595
}
9696

9797
// 外键
9898
sb.append(this.genForeignKey(model));
9999

100100
// 删除最后一个 ,号
101101
sb.deleteCharAt(sb.lastIndexOf(","));
102-
sb.append(");\r\n");
102+
sb.append(");\n");
103103

104-
sb.append("\r\n");
104+
sb.append("\n");
105105

106106
return sb.toString();
107107
}
@@ -148,7 +148,7 @@ private String genDdlDetail(DdlDetail detail) {
148148
}
149149
}
150150

151-
sb.append(",\r\n");
151+
sb.append(",\n");
152152
return sb.toString();
153153
}
154154

@@ -193,7 +193,7 @@ private String genForeignKey(DdlModel currentTableModel) throws CodeGenException
193193
// 表名
194194
//String tableName = genFullTableName(model.getDdlModel());
195195
String referenceTableName = genFullTableName(model.getForeignColumns().get(0).getForeignDdlModel());
196-
sb.append(String.format(" FOREIGN KEY(%s) REFERENCES %s(%s),\r\n",
196+
sb.append(String.format(" FOREIGN KEY(%s) REFERENCES %s(%s),\n",
197197
columnName,
198198
referenceTableName,
199199
referenceColumnName));

‎src/main/java/com/yanglb/codegen/core/translator/impl/DmlTranslatorImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ private String genDml(DmlModel model) {
6161
StringBuilder sb = new StringBuilder();
6262

6363
// 头部信息
64-
sb.append("\r\n");
65-
sb.append(String.format("-- %s\r\n", model.getSheetName()));
66-
sb.append(String.format("-- %s %s\r\n", model.getAuthor(), model.getRenewDate()));
64+
sb.append("\n");
65+
sb.append(String.format("-- %s\n", model.getSheetName()));
66+
sb.append(String.format("-- %s %s\n", model.getAuthor(), model.getRenewDate()));
6767

6868
// 每一行dml语句
6969
String columns = "";
@@ -79,7 +79,7 @@ private String genDml(DmlModel model) {
7979
}
8080

8181
// 生成完整语句并添加到sb中
82-
sb.append(String.format("INSERT INTO %s%s(%s) VALUES (%s);\r\n",
82+
sb.append(String.format("INSERT INTO %s%s(%s) VALUES (%s);\n",
8383
space,
8484
model.getName(),
8585
columns,

‎src/main/java/com/yanglb/codegen/core/translator/impl/MsgAndroidTranslatorImpl.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ protected String getSplitString() {
5454
protected void onTranslate() throws CodeGenException {
5555
super.onTranslate();
5656
StringBuilder sb = this.writableModel.getData();
57-
sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
57+
sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
5858
Infos.xmlHeader() +
59-
"<resources>\r\n");
59+
"<resources>\n");
6060

6161
// 用于检查相同的key
6262
Map<String, Boolean> keys = new HashMap<String, Boolean>();
@@ -81,17 +81,17 @@ protected void onTranslate() throws CodeGenException {
8181

8282
if (items.size() > 1) {
8383
// list
84-
sb.append(String.format(" <string-array name=\"%s\">\r\n", key));
84+
sb.append(String.format(" <string-array name=\"%s\">\n", key));
8585
for(String value:items) {
86-
sb.append(String.format(" <item>%s</item>\r\n", value));
86+
sb.append(String.format(" <item>%s</item>\n", value));
8787
}
88-
sb.append(" </string-array>\r\n");
88+
sb.append(" </string-array>\n");
8989
} else {
90-
sb.append(String.format(" <string name=\"%s\">%s</string>\r\n", key, items.get(0)));
90+
sb.append(String.format(" <string name=\"%s\">%s</string>\n", key, items.get(0)));
9191
}
9292
}
9393

94-
sb.append("</resources>\r\n");
94+
sb.append("</resources>\n");
9595

9696
this.writableModel.setData(sb);
9797
}

‎src/main/java/com/yanglb/codegen/core/translator/impl/MsgCSTranslatorImpl.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ protected String readResource(String path) throws CodeGenException {
6363
protected void onTranslate() throws CodeGenException {
6464
super.onTranslate();
6565
StringBuilder sb = this.writableModel.getData();
66-
sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
66+
sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
6767
Infos.xmlHeader() +
68-
"<root>\r\n");
68+
"<root>\n");
6969

7070
if (this.isDefaultLanguage()) {
7171
sb.append(readResource("msg/resx/schema.txt"));
@@ -78,8 +78,8 @@ protected void onTranslate() throws CodeGenException {
7878
Map<String, Boolean> keys = new HashMap<String, Boolean>();
7979
for(TableModel tblModel : this.model) {
8080
// 添加Sheet注释
81-
sb.append(String.format(" \r\n"));
82-
sb.append(String.format(" <!-- %s -->\r\n", tblModel.getSheetName()));
81+
sb.append(String.format(" \n"));
82+
sb.append(String.format(" <!-- %s -->\n", tblModel.getSheetName()));
8383

8484
for(Map<String, String> itm : tblModel.toList()) {
8585
String id = itm.get("id");
@@ -90,17 +90,17 @@ protected void onTranslate() throws CodeGenException {
9090
// 对字符串进行转换
9191
id = escape(id);
9292
String value = this.escape(itm.get(this.msgLang));
93-
sb.append(String.format(" <data name=\"%s\">\r\n", id));
94-
sb.append(String.format(" <value>%s</value>\r\n", value));
95-
sb.append(String.format(" </data>\r\n"));
93+
sb.append(String.format(" <data name=\"%s\">\n", id));
94+
sb.append(String.format(" <value>%s</value>\n", value));
95+
sb.append(String.format(" </data>\n"));
9696
}
9797
}
9898

9999
int idx = sb.lastIndexOf(",");
100100
if(idx != -1) {
101101
sb.deleteCharAt(idx);
102102
}
103-
sb.append("</root>\r\n");
103+
sb.append("</root>\n");
104104

105105
this.writableModel.setData(sb);
106106
}

‎src/main/java/com/yanglb/codegen/core/translator/impl/MsgIOSTranslatorImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected void onTranslate() throws CodeGenException {
5858
// 对字符串进行转换
5959
id = escape(id);
6060
String value = this.escape(itm.get(this.msgLang));
61-
sb.append(String.format("\"%s\" = \"%s\";\r\n", id, value));
61+
sb.append(String.format("\"%s\" = \"%s\";\n", id, value));
6262
}
6363
}
6464

‎src/main/java/com/yanglb/codegen/core/translator/impl/MsgJavaTranslatorImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected void onTranslate() throws CodeGenException {
4343

4444
int cnt = 0;
4545
for(TableModel tblModel : this.model) {
46-
sb.append(String.format("%s# %s\r\n", (cnt++ == 0)?"":"\r\n", tblModel.getSheetName()));
46+
sb.append(String.format("%s# %s\n", (cnt++ == 0)?"":"\n", tblModel.getSheetName()));
4747
for(Map<String, String> itm : tblModel.toList()) {
4848
String id = itm.get("id");
4949
if(StringUtil.isNullOrEmpty(id)) continue;

0 commit comments

Comments
 (0)