Procházet zdrojové kódy

下载离线包 增加选择语言

dengsixing před 1 rokem
rodič
revize
17ea8569e5

+ 2 - 0
src/main/java/com/fdkankan/scene/bean/DownLoadTaskBean.java

@@ -29,4 +29,6 @@ public class DownLoadTaskBean implements Serializable {
 
     private String type;
 
+    private String lang;
+
 }

+ 3 - 3
src/main/java/com/fdkankan/scene/controller/SceneDownloadLogController.java

@@ -19,7 +19,7 @@ import java.util.Map;
  *  前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-06
  */
 @RestController
@@ -31,9 +31,9 @@ public class SceneDownloadLogController {
     private ISceneDownloadLogService sceneDownloadLogService;
 
     @GetMapping("/downOfflineScene")
-    public ResultData downOfflineScene(@RequestParam("sceneCode")String num){
+    public ResultData downOfflineScene(@RequestParam("sceneCode")String num, @RequestParam(name = "lang", defaultValue = "zh")String lang){
         log.info("downOfflineScene");
-        return sceneDownloadLogService.downOfflineScene(num);
+        return sceneDownloadLogService.downOfflineScene(num, lang);
     }
     @GetMapping("/downOfflineSceneCheck")
     public ResultData downOfflineSceneCheck(@RequestParam("sceneCode")String num){

+ 2 - 2
src/main/java/com/fdkankan/scene/service/ISceneDownloadLogService.java

@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestParam;
  *  服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-06
  */
 public interface ISceneDownloadLogService extends IService<SceneDownloadLog> {
 
-    ResultData downOfflineScene(String num);
+    ResultData downOfflineScene(String num, String lang);
 
     ResultData downloadProcess(String num);
 

+ 3 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneDownLoadServiceImpl.java

@@ -88,6 +88,9 @@ public class SceneDownLoadServiceImpl implements ISceneDownLoadService {
             return null;
         }
         DownLoadTaskBean downLoadTaskBean = JSONUtil.toBean(downloadTask, DownLoadTaskBean.class);
+        if(StrUtil.isEmpty(downLoadTaskBean.getLang())){
+            downLoadTaskBean.setLang("zh");
+        }
         String num = downLoadTaskBean.getNum();
         if("v3".equals(version)){
             num = downLoadTaskBean.getSceneNum();

+ 5 - 5
src/main/java/com/fdkankan/scene/service/impl/SceneDownloadHandlerServiceImpl.java

@@ -254,7 +254,7 @@ public class SceneDownloadHandlerServiceImpl {
             this.zipSceneJson(num, sceneJson);
 
             //写入启动命令
-            this.zipBat(num, "v4");
+            this.zipBat(num, "v4", downLoadTaskBean.getLang());
 
             //打压缩包
             ZipUtil.zip(String.format(this.sourceLocal, num, ""), zipPath, Charset.forName("GBK"), true);
@@ -332,7 +332,7 @@ public class SceneDownloadHandlerServiceImpl {
             this.zipGetInfoJson(num, getInfoJson);
 
             //写入启动命令
-            this.zipBat(num, "v3");
+            this.zipBat(num, "v3", downLoadTaskBean.getLang());
 
             //打压缩包
             ZipUtil.zip(String.format(this.sourceLocal, num, ""), zipPath);
@@ -469,10 +469,10 @@ public class SceneDownloadHandlerServiceImpl {
         FileUtil.writeUtf8String(num, String.format(sourceLocal, num, "code.txt"));
     }
 
-    private void zipBat(String num, String version) throws Exception{
-        String batContent = String.format(this.exeContent, num);
+    private void zipBat(String num, String version, String lang) throws Exception{
+        String batContent = String.format(this.exeContent, num, lang);
         if("v3".equals(version)){
-            batContent = String.format(this.exeContentV3, num);
+            batContent = String.format(this.exeContentV3, num, lang);
         }
 //        this.zipBytes(out, exeName, batContent.getBytes());
         FileUtil.writeUtf8String(batContent, String.format(this.sourceLocal, num, exeName));

+ 3 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneDownloadLogServiceImpl.java

@@ -40,7 +40,7 @@ import java.util.Objects;
  *  服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-06
  */
 @Service
@@ -71,7 +71,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
 
 
     @Override
-    public ResultData downOfflineScene(String num) {
+    public ResultData downOfflineScene(String num, String lang) {
 
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         if(Objects.isNull(scenePlus)){
@@ -137,6 +137,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
             Map<String,String> params = new HashMap<>(2);
             params.put("type","local");
             params.put("num",num);
+            params.put("lang", lang);
             redisUtil.lRightPush(RedisKey.SCENE_DOWNLOADS_TASK_V4, JSONObject.toJSONString(params));
         }
 

+ 2 - 2
src/main/resources/application-standAloneProd.yml

@@ -107,11 +107,11 @@ download:
     exe-name: start-browser.bat
     exe-content: | # | 表示不转义特殊字符
       taskkill /f /t /im http.exe
-      start http://127.0.0.1:5001/spg.html?m=%s
+      start http://127.0.0.1:5001/spg.html?m=%s^&lang=%s
       http.exe -nc -p 5001 -r wwwroot
     exe-content-v3: | # | 表示不转义特殊字符
       taskkill /f /t /im http.exe
-      start http://127.0.0.1:5001/spc.html?m=%s
+      start http://127.0.0.1:5001/spc.html?m=%s^&lang=%s
       http.exe -nc -p 5001 -r wwwroot
 url:
   v3: