项目正式删除os模块，简化项目结构。

.gitlab-ci.yml

@@ -8,13 +8,10 @@ deploy:
       - rm -rf /root/spring_boot/*.jar
       - rm -rf /etc/init.d/litemall-*
       - cp -rf litemall-admin-api/target/litemall-admin-api-*-exec.jar /root/spring_boot/litemall-admin-api.jar
-      - cp -rf litemall-os-api/target/litemall-os-api-*-exec.jar /root/spring_boot/litemall-os-api.jar
       - cp -rf litemall-wx-api/target/litemall-wx-api-*-exec.jar /root/spring_boot/litemall-wx-api.jar
       - sudo chmod 777 /root/spring_boot/*.jar
       - sudo ln -f -s /root/spring_boot/litemall-admin-api.jar /etc/init.d/litemall-admin-api
-      - sudo ln -f -s /root/spring_boot/litemall-os-api.jar /etc/init.d/litemall-os-api
       - sudo ln -f -s /root/spring_boot/litemall-wx-api.jar /etc/init.d/litemall-wx-api
-      - sudo /etc/init.d/litemall-os-api restart
       - sudo /etc/init.d/litemall-wx-api restart
       - sudo /etc/init.d/litemall-admin-api restart
       - systemctl stop nginx

deploy/.gitignore

@@ -3,5 +3,4 @@
 /litemall-db/litemall_table.sql
 /litemall-db/litemall_data.sql
 /litemall-api/litemall-admin-api.jar
-/litemall-api/litemall-wx-api.jar
-/litemall-api/litemall-os-api.jar
+/litemall-api/litemall-wx-api.jar
\ No newline at end of file

deploy/bin/deploy.sh

@@ -18,12 +18,10 @@ sudo service litemall-wx-api stop
 sudo service litemall-admin-api stop
 
 #部署Spring Boot应用成服务
-sudo ln -f -s /home/ubuntu/deploy/litemall-api/litemall-os-api.jar /etc/init.d/litemall-os-api
 sudo ln -f -s /home/ubuntu/deploy/litemall-api/litemall-wx-api.jar /etc/init.d/litemall-wx-api
 sudo ln -f -s /home/ubuntu/deploy/litemall-api/litemall-admin-api.jar /etc/init.d/litemall-admin-api
 
 #启动服务
-sudo service litemall-os-api restart
 sudo service litemall-wx-api restart
 sudo service litemall-admin-api restart
 

deploy/litemall-api/README.md

 开发者需要注意的是
 
-litemall-os-api.jar、litemall-wx-api.jar和litemall-admin-api.jar三个模块内部
+litemall-wx-api.jar和litemall-admin-api.jar两个模块内部
 已经有默认的开发配置文件，但是这些配置文件可能仅仅适用于开发阶段。
 
 为了应用部署阶段时期的配置文件，开发者可以在config文件夹里面的同名配置文件中

deploy/util/package.sh

@@ -31,6 +31,5 @@ tar -zcvf ./deploy/litemall-admin/dist.tar -C ./litemall-admin/dist .
 # 这里我们需要的是可执行jar
 mvn clean
 mvn package
-cp  -f ./litemall-os-api/target/litemall-os-api-*-exec.jar ./deploy/litemall-api/litemall-os-api.jar
 cp  -f ./litemall-wx-api/target/litemall-wx-api-*-exec.jar ./deploy/litemall-api/litemall-wx-api.jar
 cp  -f ./litemall-admin-api/target/litemall-admin-api-*-exec.jar ./deploy/litemall-api/litemall-admin-api.jar
\ No newline at end of file

litemall-all/pom.xml

@@ -28,11 +28,6 @@
             <artifactId>litemall-db</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.linlinjava</groupId>
-            <artifactId>litemall-os-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.linlinjava</groupId>
             <artifactId>litemall-wx-api</artifactId>

litemall-all/src/main/java/org/linlinjava/litemall/Application.java

@@ -10,7 +10,6 @@ import org.springframework.boot.web.support.SpringBootServletInitializer;
         "org.linlinjava.litemall",
         "org.linlinjava.litemall.core",
         "org.linlinjava.litemall.db",
-        "org.linlinjava.litemall.os",
         "org.linlinjava.litemall.wx",
         "org.linlinjava.litemall.admin"})
 @MapperScan("org.linlinjava.litemall.db.dao")

litemall-all/src/test/java/org/linlinjava/litemall/allinone/AllinoneConfigTest.java

@@ -24,11 +24,8 @@ public class AllinoneConfigTest {
         // 测试获取application-wx.yml配置信息
         System.out.println(environment.getProperty("litemall.wx.app-id"));
         // 测试获取application-admin.yml配置信息
-//        System.out.println(environment.getProperty(""));
-        // 测试获取application-os.yml配置信息
 //        System.out.println(environment.getProperty(""));
         // 测试获取application.yml配置信息
-        System.out.println(environment.getProperty("logging.level.org.linlinjava.litemall.os"));
         System.out.println(environment.getProperty("logging.level.org.linlinjava.litemall.wx"));
         System.out.println(environment.getProperty("logging.level.org.linlinjava.litemall.admin"));
         System.out.println(environment.getProperty("logging.level.org.linlinjava.litemall"));

litemall-os-api/.gitignore

-
-/target/
-/litemall-os-api.iml
-/storage/

litemall-os-api/pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>litemall-os-api</artifactId>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>org.linlinjava</groupId>
-        <artifactId>litemall</artifactId>
-        <version>0.1.0</version>
-    </parent>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.linlinjava</groupId>
-            <artifactId>litemall-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.linlinjava</groupId>
-            <artifactId>litemall-db</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.qcloud</groupId>
-            <artifactId>cos_api</artifactId>
-            <version>5.4.4</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-log4j12</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <executable>true</executable>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>exec</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-        </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file

litemall-os-api/src/main/java/org/linlinjava/litemall/os/Application.java

-package org.linlinjava.litemall.os;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication(scanBasePackages={"org.linlinjava.litemall.core", "org.linlinjava.litemall.os","org.linlinjava.litemall.db"})
-@MapperScan("org.linlinjava.litemall.db.dao")
-public class Application {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-}
\ No newline at end of file

litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsIndexController.java

-package org.linlinjava.litemall.os.web;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.linlinjava.litemall.core.util.ResponseUtil;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/os/index")
-public class OsIndexController {
-    private final Log logger = LogFactory.getLog(OsIndexController.class);
-
-    @RequestMapping("/index")
-    public Object index(){
-        return ResponseUtil.ok("hello world, this is os service");
-    }
-
-}

litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/OsStorageController.java

-package org.linlinjava.litemall.os.web;
-
-import org.linlinjava.litemall.core.storage.StorageService;
-import org.linlinjava.litemall.core.util.CharUtil;
-import org.linlinjava.litemall.core.util.ResponseUtil;
-import org.linlinjava.litemall.db.domain.LitemallStorage;
-import org.linlinjava.litemall.db.service.LitemallStorageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/os/storage")
-public class OsStorageController {
-
-    @Autowired
-    private StorageService storageService;
-    @Autowired
-    private LitemallStorageService litemallStorageService;
-
-    private String generateKey(String originalFilename){
-        int index = originalFilename.lastIndexOf('.');
-        String suffix = originalFilename.substring(index);
-
-        String key = null;
-        LitemallStorage storageInfo = null;
-
-        do{
-            key = CharUtil.getRandomString(20) + suffix;
-            storageInfo = litemallStorageService.findByKey(key);
-        }
-        while(storageInfo != null);
-
-        return key;
-    }
-
-    @GetMapping("/list")
-    public Object list(String key, String name,
-                       @RequestParam(value = "page", defaultValue = "1") Integer page,
-                       @RequestParam(value = "limit", defaultValue = "10") Integer limit,
-                       String sort, String order){
-        List<LitemallStorage> storageList = litemallStorageService.querySelective(key, name, page, limit, sort, order);
-        int total = litemallStorageService.countSelective(key, name, page, limit, sort, order);
-        Map<String, Object> data = new HashMap<>();
-        data.put("total", total);
-        data.put("items", storageList);
-
-        return ResponseUtil.ok(data);
-    }
-
-    @PostMapping("/create")
-    public Object create(@RequestParam("file") MultipartFile file) {
-        String originalFilename = file.getOriginalFilename();
-        InputStream inputStream = null;
-        try {
-            inputStream = file.getInputStream();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return ResponseUtil.badArgumentValue();
-        }
-        String key = generateKey(originalFilename);
-        storageService.store(file, key);
-
-        String url = storageService.generateUrl(key);
-        LitemallStorage storageInfo = new LitemallStorage();
-        storageInfo.setName(originalFilename);
-        storageInfo.setSize((int)file.getSize());
-        storageInfo.setType(file.getContentType());
-        storageInfo.setAddTime(LocalDateTime.now());
-        storageInfo.setModified(LocalDateTime.now());
-        storageInfo.setKey(key);
-        storageInfo.setUrl(url);
-        litemallStorageService.add(storageInfo);
-        return ResponseUtil.ok(storageInfo);
-    }
-
-    @PostMapping("/read")
-    public Object read(Integer id) {
-        if(id == null){
-            return ResponseUtil.badArgument();
-        }
-        LitemallStorage storageInfo = litemallStorageService.findById(id);
-        if(storageInfo == null){
-            return ResponseUtil.badArgumentValue();
-        }
-        return ResponseUtil.ok(storageInfo);
-    }
-
-    @PostMapping("/update")
-    public Object update(@RequestBody LitemallStorage litemallStorage) {
-
-        litemallStorageService.update(litemallStorage);
-        return ResponseUtil.ok(litemallStorage);
-    }
-
-    @PostMapping("/delete")
-    public Object delete(@RequestBody LitemallStorage litemallStorage) {
-        litemallStorageService.deleteByKey(litemallStorage.getKey());
-        storageService.delete(litemallStorage.getKey());
-        return ResponseUtil.ok();
-    }
-
-    @GetMapping("/fetch/{key:.+}")
-    public ResponseEntity<Resource> fetch(@PathVariable String key) {
-        LitemallStorage litemallStorage = litemallStorageService.findByKey(key);
-        if(key == null){
-            ResponseEntity.notFound();
-        }
-        String type = litemallStorage.getType();
-        MediaType mediaType = MediaType.parseMediaType(type);
-
-        Resource file = storageService.loadAsResource(key);
-        if(file == null) {
-            ResponseEntity.notFound();
-        }
-        return ResponseEntity.ok().contentType(mediaType).body(file);
-    }
-
-    @GetMapping("/download/{key:.+}")
-    public ResponseEntity<Resource> download(@PathVariable String key) {
-        LitemallStorage litemallStorage = litemallStorageService.findByKey(key);
-        if(key == null){
-            ResponseEntity.notFound();
-        }
-        String type = litemallStorage.getType();
-        MediaType mediaType = MediaType.parseMediaType(type);
-
-        Resource file = storageService.loadAsResource(key);
-        if(file == null) {
-            ResponseEntity.notFound();
-        }
-        return ResponseEntity.ok().contentType(mediaType).header(HttpHeaders.CONTENT_DISPOSITION,
-                "attachment; filename=\"" + file.getFilename() + "\"").body(file);
-    }
-
-}

litemall-os-api/src/main/resources/application.yml

-spring:
-  profiles:
-    active: db, core, os
-  message:
-    encoding: UTF-8
-
-server:
-  port: 8081
-
-logging:
-  level:
-    root:  ERROR
-    org.springframework:  ERROR
-    org.mybatis:  ERROR
-    org.linlinjava.litemall.os:  DEBUG
-    org.linlinjava.litemall:  ERROR
\ No newline at end of file

pom.xml

@@ -22,7 +22,6 @@
     <modules>
         <module>litemall-core</module>
         <module>litemall-db</module>
-        <module>litemall-os-api</module>
         <module>litemall-wx-api</module>
         <module>litemall-admin-api</module>
         <module>litemall-all</module>
@@ -40,11 +39,6 @@
                 <artifactId>litemall-db</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.linlinjava</groupId>
-                <artifactId>litemall-os-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.linlinjava</groupId>
                 <artifactId>litemall-wx-api</artifactId>