feats

db/init.sql

@@ -0,0 +1,6 @@
+
+CREATE DATABASE `civilizedcity` DEFAULT CHARACTER SET utf8mb4;
+
+CREATE USER `civilizedcity`@`localhost` IDENTIFIED BY 'mYysYctlX*r5-@7^3$umS!J$n~nJTgnS';
+
+GRANT Alter, Alter Routine, Create, Create Routine, Create Temporary Tables, Create View, Delete, Drop, Event, Execute, Grant Option, Index, Insert, Lock Tables, References, Select, Show View, Trigger, Update ON `civilizedcity`.* TO `civilizedcity`@`localhost`;

deploy/city.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Civilized City
+After=mysqld.target
+
+[Service]
+Type=forking
+ExecStart=/opt/civilizedcity/service/service.sh start
+ExecReload=/opt/civilizedcity/service/service.sh restart
+ExecStop=/opt/civilizedcity/service/service.sh stop
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

deploy/service.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+#
+source /etc/profile
+
+SERVICE_HOME="/opt/civilizedcity/service"
+LOG="$SERVICE_HOME/logs/nohup.log"
+JAR=$(ls -lt ${SERVICE_HOME}/*.jar|head -n1|rev|cut -d" " -f1|rev)
+CONFIG_FILE="/opt/civilizedcity/service/config"
+LIB_FILES="/opt/civilizedcity/service/libs"
+PROCESS_CHARS="civilizedCity-"
+
+start() {
+    PID=`ps -ef|grep $PROCESS_CHARS|grep -v grep|awk '{print $2}'`
+    if [[ "$PID" != "" ]]; then
+        echo ""
+        echo "Service is running. pid=$PID"
+        echo ""
+        exit 0
+    else
+        echo ""
+        echo "Start service ..."
+        echo "FILE: $JAR"
+
+        nohup java -Dloader.path=$LIB_FILES -Dspring.config.location=$CONFIG_FILE/application.yml -jar $JAR > $LOG 2>&1 &
+
+        echo "Start finished"
+        echo "Pls goto $LOG see process status"
+        echo ""
+        # tail -f $LOG
+    fi
+}
+
+stop() {
+    echo ""
+    echo "Stoping service ..."
+
+    PID=`ps -ef|grep $PROCESS_CHARS|grep -v grep|awk '{print $2}'`
+    if [[ "$PID" != "" ]]; then
+        kill -9 $PID
+    fi
+
+    # 这个延迟不能去掉
+    sleep 2s
+    echo "Service is stoped"
+    echo ""
+}
+
+case $1 in
+    "start")
+        start ;;
+    "stop")
+        stop ;;
+    "reload"|"restart")
+        stop
+        start ;;
+    *)
+        echo "Usage: `basename $0` {start|stop|restart}"
+        exit 1
+esac

pom.xml

@@ -134,15 +134,50 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
+                    <mainClass>com.example.civilizedcity.CivilizedCityApplication</mainClass>
+                    <layout>ZIP</layout>
+                    <includes>
+                        <include>
+                            <groupId>nothing</groupId>
+                            <artifactId>nothing</artifactId>
+                        </include>
+                    </includes>
                     <excludes>
                         <exclude>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
                         </exclude>
                     </excludes>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>repackage</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

src/main/java/com/example/civilizedcity/controller/CommController.java

@@ -49,37 +49,26 @@ public class CommController extends BaseController {
     public ResponseBean uploadImage(@ApiParam("客户端") @PathVariable String client,
                                     @ApiParam("文件") @RequestParam("file") MultipartFile multipartFile,
                                     @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) throws Exception {
-        try {
-            String url = ossUtils.putObject(multipartFile);
-
-            Map<String, Object> resp = new HashMap<>();
-            resp.put("url", url);
-            resp.put("fileType", fileType);
-            return ResponseBean.success(resp);
-        } catch (IOException e) {
-            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+
+        //获取文件名
+        String fileName = multipartFile.getOriginalFilename();
+        String newFileName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
+
+        // 上传目录以日期分类
+        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
+        if (!tmp.exists()) {
+            tmp.mkdir();
         }
 
+        //
+        File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
+        multipartFile.transferTo(upFile);
 
-//        //获取文件名
-//        String fileName = multipartFile.getOriginalFilename();
-//        String newFileName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
-//
-//        // 上传目录以日期分类
-//        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
-//        if (!tmp.exists()) {
-//            tmp.mkdir();
-//        }
-//
-//        //
-//        File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
-//        multipartFile.transferTo(upFile);
-//
-//        String url = String.format("%s/%s", uploadPrefix, newFileName);
-//        return ResponseBean.success(new HashMap<String, Object>(){{
-//            put("url", url);
-//            put("fileType", fileType);
-//        }});
+        String url = String.format("%s/%s", uploadPrefix, newFileName);
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("url", url);
+            put("fileType", fileType);
+        }});
     }
 
     private String getUploadPath() {

src/main/java/com/example/civilizedcity/controller/TaIssueApplyController.java

@@ -11,7 +11,6 @@ import com.example.civilizedcity.common.StringUtils;
 import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.service.TaIssueService;
 import com.example.civilizedcity.service.TaOrgIssueService;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

src/main/java/com/example/civilizedcity/service/impl/TaCheckServiceImpl.java

@@ -60,27 +60,12 @@ public class TaCheckServiceImpl extends BaseServiceImpl<TaCheckMapper, TaCheck>
         List<TaCheckItem> checkItemList = taCheckItemMapper.getListBy(taCheck.getCheckId(), Constants.CHECK_OF_LOC);
         if (null == checkItemList || checkItemList.size() == 0) return 0.0;
 
-        // 所有问卷得分的和
+        // 所有试卷得分的和
         double totalScore = 0.0;
         for (TaCheckItem checkItem : checkItemList) {
             Double score = taCheckAnswerMapper.sumScore(checkItem.getItemId(), checkItem.getNum());
             double s = null == score ? 0.0 : score;
 
-            double maxScore = checkItem.getFullScore() / checkItem.getNum();
-
-            // 如果得到正分, 说明试卷得了满分
-            if (s > 0) {
-                s = maxScore;
-            }
-
-            // 如果产生扣分项
-            if (s < 0) {
-                s = maxScore + s;
-                if (s < 0) {
-                    s = 0;
-                }
-            }
-
             checkItem.setScore(s);
             taCheckItemMapper.updateById(checkItem);
 

src/main/resources/application-dev.yml

@@ -0,0 +1,47 @@
+
+spring:
+  datasource:
+    url: jdbc:mysql://110.40.183.156:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: civilizedcity
+    password: civilizedcity@ABCD1234
+    hikari:
+      # 最小空闲连接数
+      minimum-idle: 10
+      # 空闲连接存活最大时间, 默认 600000 - 10分钟
+      idle-timeout: 120000 # 2min
+      # 最大连接池数, 默认 10
+      maximum-pool-size: 30
+      # 连接池最长生命 0 无限期, 1800000 - 30分钟
+      max-lifetime: 180000 # 3min
+      # 连接超时 默认 30000 - 30秒
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+      # 连接活性检测 6000 - 1 分钟
+      keepalive-time: 6000
+
+###
+yz:
+  upload:
+    path: E:\work\public-upload
+    prefix: http://127.0.0.1:8000
+
+wx:
+  miniapp:
+    appid: wx39d721c54a0a11c4
+    secret: e970bf3e11f4dbf71ad91581c99702e6
+    token:
+    aesKey:
+
+###
+aliyun:
+  accessKeyId: LTAI5tGjnZY6k799BHxhmqcm
+  accessKeySecret: eU1DmULbgHe2dnIg3P93634PO2vEh5
+  oss:
+    roleSessionName: shigongli
+    accessKeyId: LTAI4G9zCefU1m7sKmmBnzTc
+    accessKeySecret: Vaax5O7wTL0KZdSgd8L9cGBf8AgUqJ
+    arn: acs:ram::1636896505560465:role/ramosssts
+    region: oss-cn-shanghai
+    endpoint: oss-accelerate.aliyuncs.com
+    bucketName: yz-shigongli
+    bucketURL: https://yz-shigongli.oss-accelerate.aliyuncs.com

src/main/resources/application-prod.yml

@@ -0,0 +1,60 @@
+server:
+  port: 9001
+
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: civilizedcity
+    password: mYysYctlX*r5-@7^3$umS!J$n~nJTgnS
+    hikari:
+      # 最小空闲连接数
+      minimum-idle: 10
+      # 空闲连接存活最大时间, 默认 600000 - 10分钟
+      idle-timeout: 120000 # 2min
+      # 最大连接池数, 默认 10
+      maximum-pool-size: 30
+      # 连接池最长生命 0 无限期, 1800000 - 30分钟
+      max-lifetime: 180000 # 3min
+      # 连接超时 默认 30000 - 30秒
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+      # 连接活性检测 6000 - 1 分钟
+      keepalive-time: 6000
+
+###
+yz:
+  upload:
+    path: E:\work\public-upload
+    prefix: http://127.0.0.1:8000
+  filter:
+    annList:
+      - "/swagger-ui/**"
+      - "/swagger-resources/**"
+      - "/v2/**"
+      - "/static/**"
+      - "/**/login"
+      - "/**/signin"
+      - "/ma/captcha"
+      - "/ma/change-password"
+      - "/ma/auth-phone"
+
+wx:
+  miniapp:
+    appid: wx39d721c54a0a11c4
+    secret: e970bf3e11f4dbf71ad91581c99702e6
+    token:
+    aesKey:
+
+###
+aliyun:
+  accessKeyId:
+  accessKeySecret:
+  oss:
+    roleSessionName:
+    accessKeyId:
+    accessKeySecret:
+    arn:
+    region:
+    endpoint:
+    bucketName:
+    bucketURL:

src/main/resources/application.yml

@@ -4,26 +4,6 @@ server:
     context-path: /api
 
 spring:
-  datasource:
-    url: jdbc:mysql://110.40.183.156:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: civilizedcity
-    password: civilizedcity@ABCD1234
-    hikari:
-      # 最小空闲连接数
-      minimum-idle: 10
-      # 空闲连接存活最大时间, 默认 600000 - 10分钟
-      idle-timeout: 120000 # 2min
-      # 最大连接池数, 默认 10
-      maximum-pool-size: 30
-      # 连接池最长生命 0 无限期, 1800000 - 30分钟
-      max-lifetime: 180000 # 3min
-      # 连接超时 默认 30000 - 30秒
-      connection-timeout: 30000
-      connection-test-query: SELECT 1
-      # 连接活性检测 6000 - 1 分钟
-      keepalive-time: 6000
-
-
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
@@ -36,9 +16,6 @@ spring:
 
 ###
 yz:
-  upload:
-    path: E:\work\public-upload
-    prefix: http://127.0.0.1:8000
   filter:
     annList:
       - "/swagger-ui/**"
@@ -51,28 +28,6 @@ yz:
       - "/ma/change-password"
       - "/ma/auth-phone"
 
-wx:
-  miniapp:
-    appid: wx39d721c54a0a11c4
-    secret: e970bf3e11f4dbf71ad91581c99702e6
-    token:
-    aesKey:
-
-###
-aliyun:
-  accessKeyId: LTAI5tGjnZY6k799BHxhmqcm
-  accessKeySecret: eU1DmULbgHe2dnIg3P93634PO2vEh5
-  oss:
-    roleSessionName: shigongli
-    accessKeyId: LTAI4G9zCefU1m7sKmmBnzTc
-    accessKeySecret: Vaax5O7wTL0KZdSgd8L9cGBf8AgUqJ
-    arn: acs:ram::1636896505560465:role/ramosssts
-    region: oss-cn-shanghai
-    endpoint: oss-accelerate.aliyuncs.com
-    bucketName: yz-shigongli
-    bucketURL: https://yz-shigongli.oss-accelerate.aliyuncs.com
-
-
 sa-token:
   # jwt秘钥
   jwt-secret-key: d4d778d279cf11ed9b1d525400e8554f