Explorar o código

fix 设置打包信息

tjf %!s(int64=3) %!d(string=hai) anos
pai
achega
28ffd8142f

+ 1 - 1
ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>shuazhipin</artifactId>
 
     <description>
         web服务入口

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/QueryController.java

@@ -28,6 +28,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/gateway/query")
+@CrossOrigin
 public class QueryController extends BaseController {
 
     @Autowired

+ 6 - 6
ruoyi-admin/src/main/resources/application-druid.yml

@@ -177,13 +177,13 @@ xss:
 sms_aliyun_accessKeyId: LTAI5tNA2fcBJH6EWRH6Pxr6
 sms_aliyun_accessKeySecret: 5WdaPEOvC3u9LC7pwy2DQ9pgmJvgUr
 sms_aliyun_smsUpQueueName: Alicom-Queue-1825840013569207-SmsUp
-sms_aliyun_signName: 安徽博曼网络科技有限公司
-sms_aliyun_templateCode: SMS_219525380
+sms_aliyun_signName: 刷制品检验中心
+sms_aliyun_templateCode: SMS_232893584
 #查询码询问签名
-sms_aliyun_signNameQuery: 安徽博曼网络科技有限公司
+sms_aliyun_signNameQuery: 刷制品检验中心
 #查询码询问模板
-sms_aliyun_templateCodeQuery: SMS_219525380
+sms_aliyun_templateCodeQuery: SMS_232165425
 #查询码签名
-sms_aliyun_signNameNum: 安徽博曼网络科技有限公司
+sms_aliyun_signNameNum: 刷制品检验中心
 #查询码模板
-sms_aliyun_templateCodeNum: SMS_219525380
+sms_aliyun_templateCodeNum: SMS_231449563

+ 6 - 6
ruoyi-admin/src/main/resources/application-prod.yml

@@ -179,13 +179,13 @@ xss:
 sms_aliyun_accessKeyId: LTAI5tNA2fcBJH6EWRH6Pxr6
 sms_aliyun_accessKeySecret: 5WdaPEOvC3u9LC7pwy2DQ9pgmJvgUr
 sms_aliyun_smsUpQueueName: Alicom-Queue-1825840013569207-SmsUp
-sms_aliyun_signName: 安徽博曼网络科技有限公司
-sms_aliyun_templateCode: SMS_219525380
+sms_aliyun_signName: 刷制品检验中心
+sms_aliyun_templateCode: SMS_232893584
 #查询码询问签名
-sms_aliyun_signNameQuery: 安徽博曼网络科技有限公司
+sms_aliyun_signNameQuery: 刷制品检验中心
 #查询码询问模板
-sms_aliyun_templateCodeQuery: SMS_219525380
+sms_aliyun_templateCodeQuery: SMS_232165425
 #查询码签名
-sms_aliyun_signNameNum: 安徽博曼网络科技有限公司
+sms_aliyun_signNameNum: 刷制品检验中心
 #查询码模板
-sms_aliyun_templateCodeNum: SMS_219525380
+sms_aliyun_templateCodeNum: SMS_231449563

+ 0 - 2
ruoyi-system/src/main/resources/mapper/system/ColumnNewsMapper.xml

@@ -84,7 +84,6 @@
             <if test="newsImage != null and newsImage != ''">news_image,</if>
             <if test="columnId != null">column_id,</if>
             <if test="newsContent != null and newsContent != ''">news_content,</if>
-            <if test="status != null">status,</if>
             <if test="isTop != null">is_top,</if>
             <if test="isDel != null">is_del,</if>
             <if test="reason != null">reason,</if>
@@ -99,7 +98,6 @@
             <if test="newsImage != null and newsImage != ''">#{newsImage},</if>
             <if test="columnId != null">#{columnId},</if>
             <if test="newsContent != null and newsContent != ''">#{newsContent},</if>
-            <if test="status != null">#{status},</if>
             <if test="isTop != null">#{isTop},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="reason != null">#{reason},</if>